diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-07-20 22:50:49 +0200 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-07-20 22:50:49 +0200 |
| commit | ee2067d0383ee2a45e9730402120310bde634ea5 (patch) | |
| tree | f07cb22478d12fd0d0c8311c6b6386f6bcf32144 | |
| parent | 40df603f9f4153b4d8a962644938025244f34ddc (diff) | |
| parent | 92f95384ce4b4a198b1fea93272201421f7b9a39 (diff) | |
Merge remote-tracking branch 'gerrit/master' into dabdab_4.0.3dab_4.0.2dab_4.0.1dab_4.0.0dab_3.99.3dab/4.0.3dab/4.0.2dab/4.0.1dab/4.0.0dab/3.99.34.0.34.0.24.0.14.0.03.99.3dab
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | conf.d/config.cmake | 14 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
3 files changed, 5 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4eadb8b..a909234 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.3) include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/config.cmake) -include(${PROJECT_APP_TEMPLATES_DIR}/cmake/common.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/cmake/common.cmake) # Bindings to compile # -------------------- diff --git a/conf.d/config.cmake b/conf.d/config.cmake index f6e6668..1f50917 100644 --- a/conf.d/config.cmake +++ b/conf.d/config.cmake @@ -56,19 +56,11 @@ set (gcc_minimal_version 4.9) # PKG_CONFIG required packages # ----------------------------- -set (PKG_REQUIRED_LIST - json-c - libsystemd - afb-daemon -) +set (PKG_REQUIRED_LIST) # Static constante definition # ----------------------------- -#add_compile_options() - -# LANG Specific compile flags set for all build types -set(CMAKE_C_FLAGS "" CACHE STRING "C compile flags") -set(CMAKE_CXX_FLAGS "-std=c++11" CACHE STRING "C++ compile flags") +add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-std=c++11>) # Print a helper message when every thing is finished # ---------------------------------------------------- @@ -76,7 +68,7 @@ set(CLOSING_MESSAGE "Test with: ./src/can-config-generator -m ../tests/basic.jso # (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable] # --------------------------------------------------------------------- -set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt) +# set(CMAKE_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) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 263185f..f568da1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -41,4 +41,4 @@ PROJECT_TARGET_ADD(can-config-generator) # installation directory INSTALL(TARGETS can-config-generator -RUNTIME DESTINATION ${BINDINGS_INSTALL_DIR}) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) |