From b65fa264835921390f4224e4f75ea12692682bab Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 4 Jul 2017 18:46:41 +0200 Subject: [PATCH] Change location for custom CMake files and scripts Use one additionnal level to put all app-templates related files in one directory. Change-Id: Iec297d0070d8d47a4ce9e351bedb3ec45f691af4 Signed-off-by: Romain Forlot --- cmake/common.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake/common.cmake b/cmake/common.cmake index 647d8d5..760a863 100644 --- a/cmake/common.cmake +++ b/cmake/common.cmake @@ -26,9 +26,9 @@ 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/cmake.d/[0-9][0-9]-*.cmake) +file(GLOB home_cmakefiles $ENV{HOME}/.config/app-templates/cmake.d/[0-9][0-9]-*.cmake) list(SORT home_cmakefiles) -file(GLOB system_cmakefiles /etc/cmake.d/[0-9][0-9]-*.cmake) +file(GLOB system_cmakefiles /etc/app-templates/cmake.d/[0-9][0-9]-*.cmake) list(SORT system_cmakefiles) foreach(file ${project_cmakefiles} ${home_cmakefiles} ${system_cmakefiles}) @@ -42,6 +42,9 @@ 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) + project_targets_populate() project_package_build() project_closing_msg() -- 2.16.6