summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--binding-wifi/CMakeLists.txt5
m---------conf.d/app-templates0
-rw-r--r--conf.d/cmake/config.cmake12
3 files changed, 8 insertions, 9 deletions
diff --git a/binding-wifi/CMakeLists.txt b/binding-wifi/CMakeLists.txt
index 54fef96..4f6cc9b 100644
--- a/binding-wifi/CMakeLists.txt
+++ b/binding-wifi/CMakeLists.txt
@@ -30,14 +30,9 @@ PROJECT_TARGET_ADD(wifi-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 dae59cf..f5c2495 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -27,10 +27,11 @@ set(PROJECT_AUTHOR "Tasuku Suzuki")
set(PROJECT_AUTHOR_MAIL "tasuku.suzuki@qt.io")
set(PROJECT_LICENSE "APL2.0")
set(PROJECT_LANGUAGES,"C")
+set(API_NAME "wifi-manager")
-# 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 +45,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.
@@ -158,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)