From c9974e588390c677c00c897907ba149a019bef0b Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Mon, 10 Jul 2017 13:28:59 +0000 Subject: Fix Config & compile errors to get built in Yocto Change-Id: Idea29459f2de40fbed7f5df11088ec11e5e6fd11 Signed-off-by: Romain Forlot --- CMakeLists.txt | 2 +- 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($<$:-std=c++11>) # Print a helper message when every thing is finished # ---------------------------------------------------- -- cgit 1.2.3-korg From c6e84a508af2d3c6c45110a66d09b8de2213499b Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Mon, 10 Jul 2017 14:33:41 +0000 Subject: Change default install directory of the executable Change-Id: I07dccad3e66fde09651221371f0078d397af153b Signed-off-by: Romain Forlot --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 263185f..3dfab05 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 /usr/local/bin) -- cgit 1.2.3-korg From 3db13d343c769162e615566d7f2f95b047be57ff Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Mon, 10 Jul 2017 23:27:45 +0200 Subject: Fix wrong build deps Change-Id: I86b38949e15fffe5af237ff23f78238f41a3027b Signed-off-by: Romain Forlot --- conf.d/config.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/conf.d/config.cmake b/conf.d/config.cmake index c1720ff..505b5c2 100644 --- a/conf.d/config.cmake +++ b/conf.d/config.cmake @@ -56,10 +56,7 @@ set (gcc_minimal_version 4.9) # PKG_CONFIG required packages # ----------------------------- -set (PKG_REQUIRED_LIST - json-c - libsystemd -) +set (PKG_REQUIRED_LIST) # Static constante definition # ----------------------------- -- cgit 1.2.3-korg From 92f95384ce4b4a198b1fea93272201421f7b9a39 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 11 Jul 2017 12:06:50 +0200 Subject: Change default installation directory Change-Id: I78d0f0cfa27a17a5d951610b30b2d1bc8f70212e Signed-off-by: Romain Forlot --- conf.d/config.cmake | 2 +- src/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.d/config.cmake b/conf.d/config.cmake index 505b5c2..1f50917 100644 --- a/conf.d/config.cmake +++ b/conf.d/config.cmake @@ -68,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 3dfab05..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 /usr/local/bin) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -- cgit 1.2.3-korg