[Personalrobots-commit] SF.net SVN: personalrobots:[22787] pkg/trunk

[<jfa...@us...>]

Revision: 22787
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=22787&view=rev
Author:   jfaustwg
Date:     2009-08-24 23:46:25 +0000 (Mon, 24 Aug 2009)

Log Message:
-----------
Sigh, more cmake 2.4/2.6/OSX issues... fix to build on non-OSX (2.4?)

Modified Paths:
--------------
    pkg/trunk/motion_planning/motion_planning_rviz_plugin/CMakeLists.txt
    pkg/trunk/sandbox/mapping_rviz_plugin/CMakeLists.txt
    pkg/trunk/stacks/visualization/rviz/src/default_plugin/CMakeLists.txt

Modified: pkg/trunk/motion_planning/motion_planning_rviz_plugin/CMakeLists.txt
===================================================================
--- pkg/trunk/motion_planning/motion_planning_rviz_plugin/CMakeLists.txt	2009-08-24 23:43:04 UTC (rev 22786)
+++ pkg/trunk/motion_planning/motion_planning_rviz_plugin/CMakeLists.txt	2009-08-24 23:46:25 UTC (rev 22787)
@@ -16,9 +16,15 @@
 #set the default path for built libraries to the "lib" directory
 set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
 
-rospack_add_library(${PROJECT_NAME} MODULE src/planning_display.cpp
-                                    src/init.cpp)
-                                    
+set(SOURCE_FILES src/planning_display.cpp src/init.cpp)
+
+include(CMakeDetermineSystem)
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+  rospack_add_library(${PROJECT_NAME} MODULE ${SOURCE_FILES})
+else(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+  rospack_add_library(${PROJECT_NAME} ${SOURCE_FILES})
+endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+
 find_package(wxWidgets REQUIRED)
 include(${wxWidgets_USE_FILE})
 include_directories( ${wxWidgets_INCLUDE_DIRS} )

Modified: pkg/trunk/sandbox/mapping_rviz_plugin/CMakeLists.txt
===================================================================
--- pkg/trunk/sandbox/mapping_rviz_plugin/CMakeLists.txt	2009-08-24 23:43:04 UTC (rev 22786)
+++ pkg/trunk/sandbox/mapping_rviz_plugin/CMakeLists.txt	2009-08-24 23:46:25 UTC (rev 22787)
@@ -18,9 +18,16 @@
 #set the default path for built libraries to the "lib" directory
 set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
 
-rospack_add_library(${PROJECT_NAME} MODULE src/collision_map_display.cpp
+set(SOURCE_FILES src/collision_map_display.cpp
                                     src/polygonal_map_display.cpp
                                     src/init.cpp)
+
+include(CMakeDetermineSystem)
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+  rospack_add_library(${PROJECT_NAME} MODULE ${SOURCE_FILES})
+else(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+  rospack_add_library(${PROJECT_NAME} ${SOURCE_FILES})
+endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
                                     
 find_package(wxWidgets REQUIRED)
 include(${wxWidgets_USE_FILE})

Modified: pkg/trunk/stacks/visualization/rviz/src/default_plugin/CMakeLists.txt
===================================================================
--- pkg/trunk/stacks/visualization/rviz/src/default_plugin/CMakeLists.txt	2009-08-24 23:43:04 UTC (rev 22786)
+++ pkg/trunk/stacks/visualization/rviz/src/default_plugin/CMakeLists.txt	2009-08-24 23:46:25 UTC (rev 22787)
@@ -1,6 +1,6 @@
 include_directories(.)
 
-rospack_add_library(default_plugin MODULE  markers/marker_selection_handler.cpp
+set(SOURCE_FILES markers/marker_selection_handler.cpp
                                     markers/marker_base.cpp
                                     markers/shape_marker.cpp
                                     markers/arrow_marker.cpp
@@ -25,6 +25,14 @@
                                     tf_display.cpp
                                     camera_display.cpp
                                     init.cpp)
+
+include(CMakeDetermineSystem)
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+  rospack_add_library(default_plugin MODULE ${SOURCE_FILES})
+else(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+  rospack_add_library(default_plugin ${SOURCE_FILES})
+endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+
                                     
 target_link_libraries(default_plugin ${PROJECT_NAME} ${wxWidgets_LIBRARIES} ${OGRE_LIBRARIES})
 rospack_link_boost(default_plugin thread signals filesystem system program_options)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.