update
This commit is contained in:
@@ -173,6 +173,10 @@ target_include_directories(${PROJECT_NAME}
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
${YAML_CPP_TARGET}
|
||||
robot_xmlrpcpp
|
||||
robot_time
|
||||
PRIVATE
|
||||
dl # Required for dladdr() function used in plugin_loader_helper.cpp
|
||||
)
|
||||
|
||||
# Check if we're using static library and warn user
|
||||
@@ -186,29 +190,6 @@ if(YAML_CPP_TARGET MATCHES "\\.a$" OR YAML_CPP_TARGET MATCHES "libyaml-cpp\\.a")
|
||||
)
|
||||
endif()
|
||||
|
||||
# console_bridge: use library variable if available, otherwise try target
|
||||
if(console_bridge_LIBRARIES)
|
||||
target_link_libraries(${PROJECT_NAME} PUBLIC ${console_bridge_LIBRARIES})
|
||||
elseif(TARGET console_bridge::console_bridge)
|
||||
target_link_libraries(${PROJECT_NAME} PUBLIC console_bridge::console_bridge)
|
||||
else()
|
||||
# Fallback: link directly
|
||||
target_link_libraries(${PROJECT_NAME} PUBLIC console_bridge)
|
||||
endif()
|
||||
|
||||
if(BUILDING_WITH_CATKIN)
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
${catkin_LIBRARIES}
|
||||
)
|
||||
else()
|
||||
# Standalone mode: link internal dependencies
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
robot_xmlrpcpp
|
||||
robot_time
|
||||
)
|
||||
endif()
|
||||
|
||||
## Add cmake target dependencies
|
||||
if(BUILDING_WITH_CATKIN)
|
||||
@@ -229,13 +210,14 @@ target_compile_definitions(${PROJECT_NAME}
|
||||
# Installation (Standalone CMake only)
|
||||
# ========================================================
|
||||
|
||||
if(NOT BUILDING_WITH_CATKIN)
|
||||
install(TARGETS ${PROJECT_NAME}
|
||||
EXPORT ${PROJECT_NAME}-targets
|
||||
ARCHIVE DESTINATION lib
|
||||
LIBRARY DESTINATION lib
|
||||
RUNTIME DESTINATION bin)
|
||||
# Export target trong mọi trường hợp để các target khác có thể export và phụ thuộc vào nó
|
||||
install(TARGETS ${PROJECT_NAME}
|
||||
EXPORT ${PROJECT_NAME}-targets
|
||||
ARCHIVE DESTINATION lib
|
||||
LIBRARY DESTINATION lib
|
||||
RUNTIME DESTINATION bin)
|
||||
|
||||
if(NOT BUILDING_WITH_CATKIN)
|
||||
install(DIRECTORY include/
|
||||
DESTINATION include
|
||||
FILES_MATCHING PATTERN "*.h")
|
||||
@@ -259,6 +241,11 @@ if(NOT BUILDING_WITH_CATKIN)
|
||||
${CMAKE_CURRENT_BINARY_DIR}/robot_cppConfig.cmake
|
||||
DESTINATION lib/cmake/${PROJECT_NAME}
|
||||
)
|
||||
else()
|
||||
# Khi build với Catkin, vẫn cần export để các target khác có thể export
|
||||
install(EXPORT ${PROJECT_NAME}-targets
|
||||
# NAMESPACE robot::
|
||||
DESTINATION lib/cmake/${PROJECT_NAME})
|
||||
endif()
|
||||
|
||||
# ========================================================
|
||||
|
||||
Reference in New Issue
Block a user