Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

patches: fixed linking to SDL library in map_server #95

Merged
merged 1 commit into from
Jan 22, 2019
Merged

patches: fixed linking to SDL library in map_server #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions patches/map_server.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- catkin_ws/src/navigation/map_server/CMakeLists.txt
+++ catkin_ws/src/navigation/map_server/CMakeLists.txt
@@ -12,10 +12,17 @@ find_package(Bullet REQUIRED)
@@ -12,17 +12,31 @@ find_package(Bullet REQUIRED)
find_package(SDL REQUIRED)
find_package(SDL_image REQUIRED)

Expand All @@ -21,19 +21,21 @@
endif()

catkin_package(
@@ -23,6 +30,11 @@ catkin_package(
INCLUDE_DIRS
include
+ ${SDL_INCLUDE_DIR}
LIBRARIES
map_server_image_loader
+ ${SDL_LIBRARY}
+ DEPENDS
+ BULLET
+ SDL
+ #SDL # <-- Does not work because SDL_INCLUDE_DIRS and SDL_LIBRARIES is not set.
+ SDL_IMAGE
+ YAML_CPP
CATKIN_DEPENDS
roscpp
nav_msgs
@@ -35,7 +47,7 @@ include_directories(
@@ -35,7 +49,7 @@ include_directories(
${catkin_INCLUDE_DIRS}
${SDL_INCLUDE_DIR}
${SDL_IMAGE_INCLUDE_DIRS}
Expand All @@ -42,7 +44,7 @@
)

add_library(map_server_image_loader src/image_loader.cpp)
@@ -51,7 +63,7 @@ add_executable(map_server src/main.cpp)
@@ -51,7 +65,7 @@ add_executable(map_server src/main.cpp)
add_dependencies(map_server ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
target_link_libraries(map_server
map_server_image_loader
Expand Down