From ee4b870fdc9967ed54de82757fbc2df3dec7d187 Mon Sep 17 00:00:00 2001 From: Henning Wiedemann Date: Fri, 22 Apr 2022 13:23:56 +0200 Subject: [PATCH 1/3] Fix CMake warnings --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c3b934..78db775 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,11 @@ # CMakeLists.txt has to be located in the project folder and cmake has to be # executed from 'project/build' with 'cmake ../'. -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 3.0) find_package(Rock) +project(lib_config VERSION 0.1) SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) -rock_init(lib_config 0.1) +rock_init() include_directories(src) rock_standard_layout() From 2c56fae5c32454b7246c67452fa1d1c112c9ce3b Mon Sep 17 00:00:00 2001 From: Henning Wiedemann Date: Fri, 22 Apr 2022 13:24:11 +0200 Subject: [PATCH 2/3] Fix missing yaml-cpp link --- bindings/python/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt index b82e643..88756d9 100644 --- a/bindings/python/CMakeLists.txt +++ b/bindings/python/CMakeLists.txt @@ -18,15 +18,15 @@ message(STATUS "PYTHON_INCLUDE_DIRS = ${PYTHON_INCLUDE_DIRS}") message(STATUS "Boost_LIBRARIES = ${Boost_LIBRARIES}") message(STATUS "PYTHON_INSTALL_PATH = ${PYTHON_INSTALL_PATH}") - -INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}) +INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${yaml-cpp_PKGCONFIG_INCLUDE_DIRS}) PYTHON_ADD_MODULE(bundle bundle.cpp) set_target_properties(bundle PROPERTIES PREFIX "") -target_link_libraries(bundle +target_link_libraries(bundle PUBLIC ${Boost_LIBRARIES} lib_config ${PYTHON_LIBRARIES} + ${yaml-cpp_PKGCONFIG_LIBRARIES} ) add_custom_target(rockpy From d18c06692941ee160302e5d33fdb2810450a794b Mon Sep 17 00:00:00 2001 From: Henning Wiedemann Date: Fri, 22 Apr 2022 13:29:38 +0200 Subject: [PATCH 3/3] Remove PUBLIC in target_link_libraries --- bindings/python/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt index 88756d9..5b07cb4 100644 --- a/bindings/python/CMakeLists.txt +++ b/bindings/python/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${yaml-cpp_PKGC PYTHON_ADD_MODULE(bundle bundle.cpp) set_target_properties(bundle PROPERTIES PREFIX "") -target_link_libraries(bundle PUBLIC +target_link_libraries(bundle ${Boost_LIBRARIES} lib_config ${PYTHON_LIBRARIES}