diff options
| author |   Ronan Le Martret <ronan.lemartret@iot.bzh> | 2017-06-28 16:02:47 +0200 |
|---|---|---|
| committer |   Romain Forlot <romain.forlot@iot.bzh> | 2018-10-15 18:22:47 +0200 |
| commit | 0f69780269174da304f4a8e6cac08802e8e030fd (patch) | |
| tree | 8627cb75cbf78b6ece6c8e2ec246471f0c5d516d | |
| parent | bd58cef856bb903954cbb8c3c1d23d01a1799b2c (diff) | |
change path etc/config.cmake to conf.d/cmake/config.cmake
Change-Id: I98d51ce911c51ced28760c53420ffdf474fe48f1
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
| -rw-r--r-- | cmake/cmake.d/01-variables.cmake | 4 | ||||
| -rw-r--r-- | cmake/cmake.d/02-macros.cmake | 4 | ||||
| -rw-r--r-- | cmake/cmake.d/03-extra_targets.cmake | 4 | ||||
| -rw-r--r-- | cmake/cmake.d/04-build_options.cmake | 2 | ||||
| -rw-r--r-- | cmake/common.cmake | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/cmake/cmake.d/01-variables.cmake b/cmake/cmake.d/01-variables.cmake index 570cb4a..8d4f0d1 100644 --- a/cmake/cmake.d/01-variables.cmake +++ b/cmake/cmake.d/01-variables.cmake @@ -21,7 +21,7 @@ #-------------------------------------------------------------------------- # WARNING: # Do not change this cmake template -# Customise your preferences in "./etc/config.cmake" +# Customise your preferences in "./conf.d/cmake/config.cmake" #-------------------------------------------------------------------------- # Get colorized message output non Windows OS. You know bash ? :) @@ -120,4 +120,4 @@ if(OSRELEASE MATCHES "debian") set(PACKAGING_DEB_OUTPUT_COMPAT ${PROJECT_PKG_ENTRY_POINT}/debian.compat) set(PACKAGING_DEB_OUTPUT_CONTROL ${PROJECT_PKG_ENTRY_POINT}/debian.control) set(PACKAGING_DEB_OUTPUT_RULES ${PROJECT_PKG_ENTRY_POINT}/debian.rules) -endif(OSRELEASE MATCHES "debian")
\ No newline at end of file +endif(OSRELEASE MATCHES "debian") diff --git a/cmake/cmake.d/02-macros.cmake b/cmake/cmake.d/02-macros.cmake index a04b915..fd0c43b 100644 --- a/cmake/cmake.d/02-macros.cmake +++ b/cmake/cmake.d/02-macros.cmake @@ -20,7 +20,7 @@ #-------------------------------------------------------------------------- # WARNING: # Do not change this cmake template -# Customise your preferences in "./etc/config.cmake" +# Customise your preferences in "./conf.d/cmake/config.cmake" #-------------------------------------------------------------------------- # Generic useful macro # ----------------------- @@ -274,4 +274,4 @@ macro(project_closing_msg) add_dependencies(${PROJECT_NAME}_build_done ${DEPENDENCIES_TARGET} ${PROJECT_TARGETS}) endif() -endmacro()
\ No newline at end of file +endmacro() diff --git a/cmake/cmake.d/03-extra_targets.cmake b/cmake/cmake.d/03-extra_targets.cmake index c1d38e8..45749bf 100644 --- a/cmake/cmake.d/03-extra_targets.cmake +++ b/cmake/cmake.d/03-extra_targets.cmake @@ -21,7 +21,7 @@ #-------------------------------------------------------------------------- # WARNING: # Do not change this cmake template -# Customise your preferences in "./etc/config.cmake" +# Customise your preferences in "./conf.d/cmake/config.cmake" #-------------------------------------------------------------------------- # Add a dummy target to enable global dependency order @@ -177,4 +177,4 @@ add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/conf.d/autobuild/agl/autobuild ) add_custom_target(autobuild ALL DEPENDS ${CMAKE_SOURCE_DIR}/conf.d/autobuild/agl/autobuild - ${CMAKE_SOURCE_DIR}/conf.d/autobuild/linux/autobuild)
\ No newline at end of file + ${CMAKE_SOURCE_DIR}/conf.d/autobuild/linux/autobuild) diff --git a/cmake/cmake.d/04-build_options.cmake b/cmake/cmake.d/04-build_options.cmake index 3a1fc81..b216262 100644 --- a/cmake/cmake.d/04-build_options.cmake +++ b/cmake/cmake.d/04-build_options.cmake @@ -21,7 +21,7 @@ #-------------------------------------------------------------------------- # WARNING: # Do not change this cmake template -# Customise your preferences in "./etc/config.cmake" +# Customise your preferences in "./conf.d/cmake/config.cmake" #-------------------------------------------------------------------------- # Check GCC minimal version diff --git a/cmake/common.cmake b/cmake/common.cmake index 6465aaf..647d8d5 100644 --- a/cmake/common.cmake +++ b/cmake/common.cmake @@ -21,7 +21,7 @@ #-------------------------------------------------------------------------- # WARNING: # Do not change this cmake template -# Customise your preferences in "./etc/config.cmake" +# Customise your preferences in "./conf.d/cmake/config.cmake" #-------------------------------------------------------------------------- file(GLOB project_cmakefiles ${PROJECT_APP_TEMPLATES_DIR}/cmake/cmake.d/[0-9][0-9]-*.cmake) @@ -44,4 +44,4 @@ endif(DEFINED PROJECT_SRC_DIR_PATTERN) project_targets_populate() project_package_build() -project_closing_msg()
\ No newline at end of file +project_closing_msg() |