Code Review
/
staging
/
xdg-launcher.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
OS detection to fallback instead of addition
[staging/xdg-launcher.git]
/
cmake
/
common.cmake
diff --git
a/cmake/common.cmake
b/cmake/common.cmake
index
1a7a2f0
..
5e107ac
100644
(file)
--- a/
cmake/common.cmake
+++ b/
cmake/common.cmake
@@
-36,8
+36,12
@@
foreach(file ${system_cmakefiles} ${home_cmakefiles} ${project_cmakefiles})
include(${file})
endforeach()
include(${file})
endforeach()
-file(GLOB project_cmakefiles ${ENTRY_POINT}/cmake/[0-9][0-9]-
common*.cmake ${ENTRY_POINT}/cmake/[0-9][0-9]-
${OSRELEASE}*.cmake )
+file(GLOB project_cmakefiles ${ENTRY_POINT}/cmake/[0-9][0-9]-${OSRELEASE}*.cmake )
list(SORT project_cmakefiles)
list(SORT project_cmakefiles)
+if(NOT ${project_cmakefiles})
+ file(GLOB project_cmakefiles ${ENTRY_POINT}/cmake/[0-9][0-9]-default*.cmake)
+endif()
+
foreach(file ${project_cmakefiles})
message(STATUS "Include: ${file}")
include(${file})
foreach(file ${project_cmakefiles})
message(STATUS "Include: ${file}")
include(${file})