OS detection to fallback instead of addition
authorRomain Forlot <romain.forlot@iot.bzh>
Wed, 23 Aug 2017 15:14:45 +0000 (17:14 +0200)
committerRomain Forlot <romain.forlot@iot.bzh>
Wed, 23 Aug 2017 15:14:45 +0000 (17:14 +0200)
Instead of include a default cmake file in addition of the
others, use it as fallback if any other cmake file doesn't
match

Change-Id: Ib46e0e64a5f485dcad4e41f092936484da83b7f4
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
cmake/common.cmake

index 1a7a2f0..5e107ac 100644 (file)
@@ -36,8 +36,12 @@ foreach(file ${system_cmakefiles} ${home_cmakefiles} ${project_cmakefiles})
        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)
+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})