diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2018-10-23 15:26:36 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2018-10-31 16:53:38 +0100 |
| commit | 45d4198af0c314cdcd3d489429953a5b93de988b (patch) | |
| tree | 931a88a25b972dd5893cb4eff7c4c2fe19e15679 | |
| parent | 1f43dba44258b58fb21759e513abc25950e40a6e (diff) | |
Migrate app-templates to CMake module
Bug-AGL SPEC-1682
Change-Id: I2fa1714779391e1a22b5cf527bd8741ba28c9f2b
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | binding-bluetooth/CMakeLists.txt | 5 | ||||
| m--------- | conf.d/app-templates | 0 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 13 |
3 files changed, 8 insertions, 10 deletions
diff --git a/binding-bluetooth/CMakeLists.txt b/binding-bluetooth/CMakeLists.txt index a9abca9..7461824 100644 --- a/binding-bluetooth/CMakeLists.txt +++ b/binding-bluetooth/CMakeLists.txt @@ -33,14 +33,9 @@ PROJECT_TARGET_ADD(bluetooth-binding) SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES PREFIX "libafm-" 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 df7336c..6d7ace7 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -28,9 +28,9 @@ set(PROJECT_AUTHOR_MAIL "tasuku.suzuki@qt.io") 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. @@ -44,7 +44,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. @@ -88,7 +88,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) @@ -159,5 +159,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) |