diff --git a/hello_plugin/CMakeLists.txt b/hello_plugin/CMakeLists.txt index 8df392f87658baa3beb7af2a98055c8a88dde949..36a22f7a7d78cb2fbf6ed7a2bf26b29a188d7f3c 100644 --- a/hello_plugin/CMakeLists.txt +++ b/hello_plugin/CMakeLists.txt @@ -6,7 +6,7 @@ ADD_EXECUTABLE(hello_plugin hello_plugin.cpp) ADD_EXECUTABLE(params_autoconf params_autoconf.cpp) # target_link_libraries(hello_plugin class_loader boost_system console_bridge wolf yaml-cpp ${CERES_LIBRARIES}) # target_link_libraries(params_autoconf class_loader boost_system console_bridge wolf yaml-cpp ) -target_link_libraries(hello_plugin wolf yaml-cpp ${CERES_LIBRARIES} dl) +target_link_libraries(hello_plugin wolf hellowolf yaml-cpp ${CERES_LIBRARIES} dl) target_link_libraries(params_autoconf wolf yaml-cpp dl) # These lines always at the end diff --git a/hello_wolf/CMakeLists.txt b/hello_wolf/CMakeLists.txt index 20309f55ccc7ee673ecb67fc7f5de039369d9282..f8f41bd407e9e4d9fc9eaf71f92b7111b0772feb 100644 --- a/hello_wolf/CMakeLists.txt +++ b/hello_wolf/CMakeLists.txt @@ -3,16 +3,16 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) # Forward var to parent scope SET(HDRS_PROCESSOR ${HDRS_PROCESSOR} - ${CMAKE_CURRENT_SOURCE_DIR}/capture_range_bearing.h - ${CMAKE_CURRENT_SOURCE_DIR}/factor_bearing.h - ${CMAKE_CURRENT_SOURCE_DIR}/factor_range_bearing.h - ${CMAKE_CURRENT_SOURCE_DIR}/feature_range_bearing.h - ${CMAKE_CURRENT_SOURCE_DIR}/landmark_point_2D.h - ${CMAKE_CURRENT_SOURCE_DIR}/processor_range_bearing.h - ${CMAKE_CURRENT_SOURCE_DIR}/sensor_range_bearing.h + ${CMAKE_CURRENT_SOURCE_DIR}/capture_range_bearing.h + ${CMAKE_CURRENT_SOURCE_DIR}/factor_bearing.h + ${CMAKE_CURRENT_SOURCE_DIR}/factor_range_bearing.h + ${CMAKE_CURRENT_SOURCE_DIR}/feature_range_bearing.h + ${CMAKE_CURRENT_SOURCE_DIR}/landmark_point_2D.h + ${CMAKE_CURRENT_SOURCE_DIR}/processor_range_bearing.h + ${CMAKE_CURRENT_SOURCE_DIR}/sensor_range_bearing.h ) -SET(SRCS_PROCESSOR ${SRCS_PROCESSOR} + SET(SRCS_HELLOWOLF # ${CMAKE_CURRENT_SOURCE_DIR}/hello_wolf.cpp ${CMAKE_CURRENT_SOURCE_DIR}/capture_range_bearing.cpp ${CMAKE_CURRENT_SOURCE_DIR}/feature_range_bearing.cpp @@ -20,14 +20,10 @@ SET(SRCS_PROCESSOR ${SRCS_PROCESSOR} ${CMAKE_CURRENT_SOURCE_DIR}/processor_range_bearing.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sensor_range_bearing.cpp ) - +add_library(hellowolf SHARED ${SRCS_HELLOWOLF}) ADD_EXECUTABLE(hello_wolf hello_wolf.cpp) -TARGET_LINK_LIBRARIES(hello_wolf ${PROJECT_NAME}) +TARGET_LINK_LIBRARIES(hello_wolf ${PROJECT_NAME} hellowolf) add_library(sensor_odom SHARED ../src/sensor/sensor_odom_2D.cpp ../src/processor/processor_odom_2D.cpp) -TARGET_LINK_LIBRARIES(sensor_odom ${PROJECT_NAME}) +TARGET_LINK_LIBRARIES(sensor_odom ${PROJECT_NAME} hellowolf) add_library(range_bearing SHARED sensor_range_bearing.cpp processor_range_bearing.cpp) -TARGET_LINK_LIBRARIES(range_bearing ${PROJECT_NAME}) - -# These lines always at the end -SET(HDRS_PROCESSOR ${HDRS_PROCESSOR} PARENT_SCOPE ) -SET(SRCS_PROCESSOR ${SRCS_PROCESSOR} PARENT_SCOPE ) +TARGET_LINK_LIBRARIES(range_bearing ${PROJECT_NAME} hellowolf) \ No newline at end of file