diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-07-10 13:28:59 +0000 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-07-10 13:28:59 +0000 |
| commit | c9974e588390c677c00c897907ba149a019bef0b (patch) | |
| tree | f72281c6dc0d3044a47f4db4b7ed4c6ea48fbfcc | |
| parent | 71760fc9d5a027b5cd837570f121db999a7b8037 (diff) | |
Fix Config & compile errors to get built in Yocto
Change-Id: Idea29459f2de40fbed7f5df11088ec11e5e6fd11
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | conf.d/config.cmake | 7 |
2 files changed, 2 insertions, 7 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..c1720ff 100644 --- a/conf.d/config.cmake +++ b/conf.d/config.cmake @@ -59,16 +59,11 @@ set (gcc_minimal_version 4.9) set (PKG_REQUIRED_LIST json-c libsystemd - afb-daemon ) # 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 # ---------------------------------------------------- |