fixes for cmake / catkin

Armin Hornung · Armin Hornung · commit adf9ca61829d · 2013-01-05T15:45:56.000Z
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,4 +14,4 @@ include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
 # variables.
 #list(APPEND CPACK_SOURCE_IGNORE_FILES /core/experimental)
 
-rosbuild_make_distribution(0.4.7.3)
+rosbuild_make_distribution(0.4.7.4)
diff --git a/octomap_server/CMakeLists.txt b/octomap_server/CMakeLists.txt
@@ -18,7 +18,7 @@ link_directories(${OCTOMAP_LIBRARY_DIRS})
 link_libraries(${PROJECT_NAME} ${OCTOMAP_LIBRARIES})
 # required fix / workaround for catkin?
 # REMOVE WHEN COMPILING WITH PLAIN CMAKE OCTOMAP
-set (OCTOMAP_LIBRARIES ${octomap_LIBRARIES})
+#set (OCTOMAP_LIBRARIES ${octomap_LIBRARIES})
 
 find_package(PCL REQUIRED)
 include_directories(${PCL_INCLUDE_DIRS})
