Only 1 include in root CMake and no macro to call

[apps/app-templates.git] / cmake / common.cmake

diff --git a/cmake/common.cmake b/cmake/common.cmake
index a98cac9..6465aaf 100644 (file)
--- a/cmake/common.cmake
+++ b/cmake/common.cmake
@@ -31,22 +31,17 @@ list(SORT home_cmakefiles)
 file(GLOB system_cmakefiles /etc/cmake.d/[0-9][0-9]-*.cmake)
 list(SORT system_cmakefiles)
 
-foreach(file ${system_cmakefiles} ${home_cmakefiles} ${project_cmakefiles})
+foreach(file ${project_cmakefiles} ${home_cmakefiles} ${system_cmakefiles})
        message(STATUS "Include: ${file}")
        include(${file})
 endforeach()
 
-macro(project_build)
-       set (ARGSLIST ${ARGN})
-       list(LENGTH ARGSLIST ARGSNUM)
-       if(${ARGSNUM} GREATER 0)
-               set(pattern "${ARGV0}")
-       else()
-               set(pattern "*")
-       endif()
+if(DEFINED PROJECT_SRC_DIR_PATTERN)
+       project_subdirs_add(${PROJECT_SRC_DIR_PATTERN})
+else()
+       project_subdirs_add()
+endif(DEFINED PROJECT_SRC_DIR_PATTERN)
 
-       project_subdirs_add(${pattern})
-       project_targets_populate()
-       project_package_build()
-       project_closing_msg()
-endmacro(project_build)
\ No newline at end of file
+project_targets_populate()
+project_package_build()
+project_closing_msg()
\ No newline at end of file