diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2018-07-18 15:12:20 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2018-07-25 12:23:52 +0000 |
| commit | 16177cee48461c9d807c95bbb2519c63b2524d89 (patch) | |
| tree | 483c8d6db8930322a803755d6129a8d3cabfd5a8 | |
| parent | d7a6282e16ea060cdbd27d7c2c71cc6c0a56dc5c (diff) | |
Align config.cmake file with app-template updateflounder_5.99.2flounder/5.99.25.99.2
Submodule conf.d/app-templates 92646f6..f94e45e:
> Align sample on actual default compile options
> Add support to binding version 3.
> Warning if not using wgtpkg-pack to make a widget
> Rework CMAKE_INSTALL_PREFIX and INSTALL_PREFIX var
> Be able to overwrite BUILD_TYPE using CLI
> Use CACHE variable for other common CMAKE variable
> Fix:: wrong wgt using RELEASE BUILD TYPE
> Fix: SYSROOT location detection... Wrong test.
> Change the default debug compilation options.
> Clearer coverage compilation options configuration
> Don't overwrite the autobuild script if it exists
> Disable the in-tree build method.
> Detect Yocto as OS distribution
> Fix: wrong compile options added
Change-Id: I9d9f607108160e818e8d6345e9c45c02736d7355
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| m--------- | conf.d/app-templates | 0 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 15 |
2 files changed, 5 insertions, 10 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates -Subproject 92646f63ffc32e2c6ede8fb10da2299fc5a5456 +Subproject f94e45e8a48e16e3001cb55c4f8c3c0a2a2c9e2 diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 172e20a2..c84c75a4 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -68,11 +68,11 @@ set (PKG_REQUIRED_LIST # Prefix path where will be installed the files # Default: /usr/local (need root permission to write in) # ------------------------------------------------------ -set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt) +set(INSTALL_PREFIX $ENV{HOME}/opt) # Customize link option # ----------------------------- -list (APPEND link_libraries -pthread --coverage) +list (APPEND link_libraries -pthread) # Compilation options definition # Use CMake generator expressions to specify only for a specific language @@ -108,21 +108,16 @@ set(CXX_COMPILE_OPTIONS -pthread CACHE STRING "Compilation flags for C++ languag # -ggdb # -D_FORTIFY_SOURCE=2 # CACHE STRING "Compilation flags for DEBUG build type.") -#set(CCOV_COMPILE_OPTIONS +#set(COVERAGE_COMPILE_OPTIONS # -g # -O2 # --coverage -# CACHE STRING "Compilation flags for CCOV build type.") +# CACHE STRING "Compilation flags for COVERAGE build type.") #set(RELEASE_COMPILE_OPTIONS -# -g # -O2 +# -D_FORTIFY_SOURCE=2 # CACHE STRING "Compilation flags for RELEASE build type.") -# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable] -# --------------------------------------------------------------------- -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) - # Optional location for config.xml.in # ----------------------------------- #set(WIDGET_ICON "\"${CMAKE_SOURCE_DIR}conf.d/wgt/${PROJECT_ICON}\"" CACHE PATH "Path to the widget icon") |