X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmake%2Fcommon.cmake;h=d0ec12e91a5fd0314f3ee9721fe4661121f5b840;hb=fcc49c7b95fb9a29013340a0c6ce910c0e95e5de;hp=760a8636bae5b66aed8ee52160451fa20da804f3;hpb=b65fa264835921390f4224e4f75ea12692682bab;p=apps%2Fapp-templates.git

diff --git a/cmake/common.cmake b/cmake/common.cmake
index 760a863..d0ec12e 100644
--- a/cmake/common.cmake
+++ b/cmake/common.cmake
@@ -26,12 +26,23 @@
 
 file(GLOB project_cmakefiles ${PROJECT_APP_TEMPLATES_DIR}/cmake/cmake.d/[0-9][0-9]-*.cmake)
 list(SORT project_cmakefiles)
-file(GLOB home_cmakefiles $ENV{HOME}/.config/app-templates/cmake.d/[0-9][0-9]-*.cmake)
+file(GLOB home_cmakefiles $ENV{HOME}/.config/app-templates/cmake.d/[0-9][0-9]-common*.cmake $ENV{HOME}/.config/app-templates/cmake.d/[0-9][0-9]-${PROJECT_NAME}*.cmake)
 list(SORT home_cmakefiles)
-file(GLOB system_cmakefiles /etc/app-templates/cmake.d/[0-9][0-9]-*.cmake)
+file(GLOB system_cmakefiles /etc/app-templates/cmake.d/[0-9][0-9]-common*.cmake /etc/app-templates/cmake.d/[0-9][0-9]-${PROJECT_NAME}*.cmake)
 list(SORT system_cmakefiles)
 
-foreach(file ${project_cmakefiles} ${home_cmakefiles} ${system_cmakefiles})
+foreach(file ${system_cmakefiles} ${home_cmakefiles} ${project_cmakefiles})
+	message(STATUS "Include: ${file}")
+	include(${file})
+endforeach()
+
+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})
 endforeach()
@@ -42,9 +53,11 @@ else()
 	project_subdirs_add()
 endif(DEFINED PROJECT_SRC_DIR_PATTERN)
 
-configure_file_in_dir($ENV{HOME}/.config/app-templates/scripts)
-configure_file_in_dir(/etc/app-templates/scripts)
+configure_files_in_dir(${PROJECT_APP_TEMPLATES_DIR}/${ENTRY_POINT}/template.d)
+configure_files_in_dir($ENV{HOME}/.config/app-templates/scripts)
+configure_files_in_dir(/etc/app-templates/scripts)
 
 project_targets_populate()
+remote_targets_populate()
 project_package_build()
 project_closing_msg()