diff options
| author |   tbultel <tbultel@free.fr> | 2018-11-07 10:12:53 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2018-11-07 10:12:53 +0100 |
| commit | 58d6669b5eea1ea37d0077f471950e4da6256a65 (patch) | |
| tree | 68d10713ccb2f56e57f74bf8f1d6a5f1811cea9d | |
| parent | 70fb348f05ff07dab3e1e1e6098ab03fa151ce15 (diff) | |
| parent | b34cd90fe2487c66846b0b40de94db3ae9b7d99a (diff) | |
Merge pull request #2 from iotbzh/app-templates-migration
Migrate app-templates to CMake module
| m--------- | conf.d/app-templates | 0 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 21 | ||||
| -rw-r--r-- | mixer-binding/CMakeLists.txt | 1 |
3 files changed, 12 insertions, 10 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates deleted file mode 160000 -Subproject 3dc85ecc9693a3a4af6d1143507f56b6800d523 diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index f2dd44f..6f5caf5 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -27,11 +27,11 @@ set(PROJECT_AUTHOR "Ar Foll, Fulup") set(PROJECT_AUTHOR_MAIL "fulup@iot.bzh") set(PROJECT_LICENSE "APL2.0") set(PROJECT_LANGUAGES "C") +set(API_NAME "smixer")) - -# 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. @@ -45,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") set(USE_EFENCE 0) # Kernel selection if needed. You can choose between a @@ -116,14 +116,14 @@ list(APPEND link_libraries afb-helpers) # CACHE STRING "Compilation flags for PROFILING build type.") #set(DEBUG_COMPILE_OPTIONS # -g +# -O0 # -ggdb -# -Wp,-U_FORTIFY_SOURCE # CACHE STRING "Compilation flags for DEBUG build type.") -#set(CCOV_COMPILE_OPTIONS +#set(COVERAGE_COMPILE_OPTIONS # -g -# -O2 +# -O0 # --coverage -# CACHE STRING "Compilation flags for CCOV build type.") +# CACHE STRING "Compilation flags for COVERAGE build type.") #set(RELEASE_COMPILE_OPTIONS # -g # -O2 @@ -211,5 +211,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) diff --git a/mixer-binding/CMakeLists.txt b/mixer-binding/CMakeLists.txt index 680c2c4..9e79a21 100644 --- a/mixer-binding/CMakeLists.txt +++ b/mixer-binding/CMakeLists.txt @@ -26,7 +26,6 @@ PROJECT_TARGET_ADD(softmixer-binding) SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES PREFIX "" LABELS "BINDING" - LINK_FLAGS ${BINDINGS_LINK_FLAG} OUTPUT_NAME ${TARGET_NAME} ) |