update
This commit is contained in:
@@ -17,7 +17,6 @@ set(CMAKE_CXX_EXTENSIONS OFF)
|
||||
|
||||
# Find dependencies
|
||||
find_package(yaml-cpp REQUIRED)
|
||||
find_package(console_bridge REQUIRED)
|
||||
|
||||
if (NOT BUILDING_WITH_CATKIN)
|
||||
|
||||
@@ -48,7 +47,7 @@ else()
|
||||
INCLUDE_DIRS include
|
||||
LIBRARIES ${PROJECT_NAME}
|
||||
CATKIN_DEPENDS robot_xmlrpcpp robot_time
|
||||
# Note: yaml-cpp and console_bridge are system dependencies,
|
||||
# Note: yaml-cpp are system dependencies,
|
||||
# linked via target_link_libraries, not via catkin_package DEPENDS
|
||||
)
|
||||
|
||||
@@ -150,6 +149,8 @@ else()
|
||||
|
||||
set_target_properties(${PROJECT_NAME} PROPERTIES
|
||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
|
||||
BUILD_RPATH "${CMAKE_BINARY_DIR}"
|
||||
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
|
||||
)
|
||||
|
||||
endif()
|
||||
@@ -220,7 +221,7 @@ else()
|
||||
message(STATUS "Project: ${PROJECT_NAME}")
|
||||
message(STATUS "Version: ${PROJECT_VERSION}")
|
||||
message(STATUS "C++ Standard: ${CMAKE_CXX_STANDARD}")
|
||||
message(STATUS "Dependencies: robot_xmlrpcpp, robot_time, yaml-cpp, console_bridge")
|
||||
message(STATUS "Dependencies: robot_xmlrpcpp, robot_time, yaml-cpp")
|
||||
message(STATUS "=================================")
|
||||
endif()
|
||||
|
||||
@@ -247,6 +248,8 @@ if(BUILD_TESTS)
|
||||
|
||||
set_target_properties(test_node_handle PROPERTIES
|
||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
|
||||
BUILD_RPATH "${CMAKE_BINARY_DIR}"
|
||||
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
|
||||
)
|
||||
|
||||
# Link filesystem library if needed
|
||||
|
||||
Reference in New Issue
Block a user