Merge pull request #21 from hwiedDFKI/master

Fix yaml-cpp linking in python binings

Author: maltewi

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()
 

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
     ${Boost_LIBRARIES}
     lib_config
     ${PYTHON_LIBRARIES}
+    ${yaml-cpp_PKGCONFIG_LIBRARIES}
 )
 
 add_custom_target(rockpy