update
This commit is contained in:
@@ -1,6 +1,13 @@
|
||||
cmake_minimum_required(VERSION 3.0.2)
|
||||
project(map_server)
|
||||
|
||||
# Suppress RPATH cycle warnings by disabling automatic RPATH detection
|
||||
# We'll set RPATH explicitly for each target
|
||||
set(CMAKE_SKIP_RPATH FALSE)
|
||||
set(CMAKE_SKIP_BUILD_RPATH FALSE)
|
||||
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
|
||||
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
|
||||
|
||||
find_package(catkin REQUIRED
|
||||
COMPONENTS
|
||||
roscpp
|
||||
@@ -56,6 +63,13 @@ target_link_libraries(map_server_image_loader
|
||||
${SDL_IMAGE_LIBRARIES}
|
||||
${YAMLCPP_LIBRARIES}
|
||||
)
|
||||
# Fix circular RPATH dependency: disable automatic RPATH detection to avoid cycle warnings
|
||||
# Libraries will be found via LD_LIBRARY_PATH or system paths
|
||||
set_target_properties(map_server_image_loader PROPERTIES
|
||||
SKIP_BUILD_RPATH TRUE
|
||||
BUILD_WITH_INSTALL_RPATH FALSE
|
||||
INSTALL_RPATH_USE_LINK_PATH FALSE
|
||||
)
|
||||
|
||||
add_library(map_server_lib src/map_server.cpp)
|
||||
add_dependencies(map_server_lib map_server_image_loader ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
|
||||
@@ -67,6 +81,13 @@ target_link_libraries(map_server_lib
|
||||
${SDL_IMAGE_LIBRARIES}
|
||||
${YAMLCPP_LIBRARIES}
|
||||
)
|
||||
# Fix circular RPATH dependency: disable automatic RPATH detection to avoid cycle warnings
|
||||
# Libraries will be found via LD_LIBRARY_PATH or system paths
|
||||
set_target_properties(map_server_lib PROPERTIES
|
||||
SKIP_BUILD_RPATH TRUE
|
||||
BUILD_WITH_INSTALL_RPATH FALSE
|
||||
INSTALL_RPATH_USE_LINK_PATH FALSE
|
||||
)
|
||||
|
||||
add_library (map_generator_lib src/map_generator.cpp)
|
||||
add_dependencies(map_generator_lib ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
|
||||
@@ -85,6 +106,13 @@ target_link_libraries(map_server
|
||||
${YAMLCPP_LIBRARIES}
|
||||
${catkin_LIBRARIES}
|
||||
)
|
||||
# Fix circular RPATH dependency: disable automatic RPATH detection to avoid cycle warnings
|
||||
# Libraries will be found via LD_LIBRARY_PATH or system paths
|
||||
set_target_properties(map_server PROPERTIES
|
||||
SKIP_BUILD_RPATH TRUE
|
||||
BUILD_WITH_INSTALL_RPATH FALSE
|
||||
INSTALL_RPATH_USE_LINK_PATH FALSE
|
||||
)
|
||||
|
||||
add_executable(map_server-map_saver src/map_saver.cpp)
|
||||
add_dependencies(map_server-map_saver map_generator_lib ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
|
||||
@@ -114,6 +142,13 @@ if(CATKIN_ENABLE_TESTING)
|
||||
${SDL_LIBRARY}
|
||||
${SDL_IMAGE_LIBRARIES}
|
||||
)
|
||||
# Fix circular RPATH dependency: disable automatic RPATH detection to avoid cycle warnings
|
||||
# Libraries will be found via LD_LIBRARY_PATH or system paths
|
||||
set_target_properties(${PROJECT_NAME}_utest PROPERTIES
|
||||
SKIP_BUILD_RPATH TRUE
|
||||
BUILD_WITH_INSTALL_RPATH FALSE
|
||||
INSTALL_RPATH_USE_LINK_PATH FALSE
|
||||
)
|
||||
|
||||
find_package(roslib REQUIRED)
|
||||
include_directories(${roslib_INCLUDE_DIRS})
|
||||
|
||||
Reference in New Issue
Block a user