Merge pull request #95 from Intermodalics/fix-map_server-linking

patches: fixed linking to SDL library in map_server
Intermodalics · Jan 22, 2019 · 469bee0 · 469bee0
2 parents 11f4d35 + 61f965b
commit 469bee0
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/patches/map_server.patch b/patches/map_server.patch
@@ -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)
 
@@ -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}
@@ -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