summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Jahnke <tobias.jahnke@microchip.com>2018-11-20 15:46:42 +0100
committerTobias Jahnke <tobias.jahnke@microchip.com>2018-12-18 13:01:13 +0100
commit27a3ecb91d0969a89371b2c6d2728095a688b15c (patch)
tree3823992f56bbc35a0302130f4c8de2d57432200d
parenteecae0a0a32d5783424d37515c8522661471cdfe (diff)
hal-unicens: switched to cmaketemplate
Bug-AGL: SPEC-1505 Signed-off-by: Tobias Jahnke <tobias.jahnke@microchip.com>
-rw-r--r--.gitignore1
-rw-r--r--.gitmodules3
m---------conf.d/app-templates0
-rw-r--r--conf.d/cmake/config.cmake9
4 files changed, 7 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index b1bc6d2..107fa2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
build/
nbproject/private/
.vscode/
+*autobuild/
diff --git a/.gitmodules b/.gitmodules
index 07a7d51..9b45c19 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "conf.d/app-templates"]
- path = conf.d/app-templates
- url = https://gerrit.automotivelinux.org/gerrit/apps/app-templates
[submodule "afb-helpers"]
path = afb-helpers
url = https://gerrit.automotivelinux.org/gerrit/apps/app-afb-helpers-submodule
diff --git a/conf.d/app-templates b/conf.d/app-templates
deleted file mode 160000
-Subproject 35065ca3a59d327e68b18b5cf2080fb940b6ee4
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 10d3975..52ab7bb 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -29,9 +29,9 @@ set(PROJECT_AUTHOR_MAIL "jonathan.aillet@iot.bzh")
set(PROJECT_LICENSE "APL2.0")
set(PROJECT_LANGUAGES "C")
-# Where are stored default templates files from submodule or subtree app-templates in your project tree
+# Where are stored the project configuration files
# relative to the root project directory
-set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
+set(PROJECT_CMAKE_CONF_DIR "conf.d")
# Where are stored your external libraries for your project. This is 3rd party library that you don't maintain
# but used and must be built and linked.
@@ -209,5 +209,8 @@ set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install
# This include is mandatory and MUST happens at the end
# of this file, else you expose you to unexpected behavior
+#
+# This CMake module could be found at the following url:
+# https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/cmake-apps-module
# -----------------------------------------------------------
-include(${PROJECT_APP_TEMPLATES_DIR}/cmake/common.cmake)
+include(CMakeAfbTemplates)