diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2018-10-23 15:26:33 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2018-10-31 16:52:37 +0100 |
| commit | 26d2f16fafb14235ca7d062bc4471d8b5e0dec54 (patch) | |
| tree | 4932c0ebff1bc99af61ae1c2fd5fcde2bb197379 | |
| parent | 6bbb0b8459af94c1a7c47714e92995200f8ae9e7 (diff) | |
Migrate app-templates to CMake moduleguppy_6.99.3guppy_6.99.2guppy_6.99.1guppy/6.99.3guppy/6.99.2guppy/6.99.16.99.36.99.26.99.1
Bug-AGL SPEC-1682
Change-Id: I22a946da7f379b71612cc419e8915921bc0bf858
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | binding/CMakeLists.txt | 5 | ||||
| m--------- | conf.d/app-templates | 0 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 14 |
3 files changed, 9 insertions, 10 deletions
diff --git a/binding/CMakeLists.txt b/binding/CMakeLists.txt index bdd5d5b..0d05d90 100644 --- a/binding/CMakeLists.txt +++ b/binding/CMakeLists.txt @@ -26,14 +26,9 @@ PROJECT_TARGET_ADD(afm-weather-binding) # Binder exposes a unique public entry point SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES LABELS "BINDING" - LINK_FLAGS ${BINDINGS_LINK_FLAG} OUTPUT_NAME ${TARGET_NAME} ) # Library dependencies (include updates automatically) TARGET_LINK_LIBRARIES(${TARGET_NAME} ${link_libraries}) - # installation directory - INSTALL(TARGETS ${TARGET_NAME} - LIBRARY DESTINATION ${BINDINGS_INSTALL_DIR}) - diff --git a/conf.d/app-templates b/conf.d/app-templates deleted file mode 160000 -Subproject 8967162dd12bce89f9ae27f5c9bce7b78624e3f diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 3b70742..792b9ae 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -25,10 +25,11 @@ set(PROJECT_VERSION "1.0") set(PROJECT_ICON "icon.png") set(PROJECT_LICENSE "APL2.0") set(PROJECT_LANGUAGES,"C") +set(API_NAME "weather") -# 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. @@ -42,7 +43,7 @@ set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates") # Compilation Mode (DEBUG, RELEASE) # ---------------------------------- -set(CMAKE_BUILD_TYPE "DEBUG") +set(BUILD_TYPE "RELEASE") # Kernel selection if needed. You can choose between a # mandatory version to impose a minimal version. @@ -79,7 +80,7 @@ list (APPEND link_libraries -pthread) # (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable] # --------------------------------------------------------------------- -set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt) +set(INSTALL_PREFIX $ENV{HOME}/opt) set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib) @@ -148,5 +149,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) |