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

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

Revision: 22774
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=22774&view=rev
Author:   jfaustwg
Date:     2009-08-24 22:41:26 +0000 (Mon, 24 Aug 2009)

Log Message:
-----------
rviz running on OSX again, plugins working

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/manifest.xml
    pkg/trunk/stacks/visualization/rviz/src/default_plugin/CMakeLists.txt
    pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/plugin.cpp

Modified: pkg/trunk/motion_planning/motion_planning_rviz_plugin/CMakeLists.txt
===================================================================
--- pkg/trunk/motion_planning/motion_planning_rviz_plugin/CMakeLists.txt	2009-08-24 22:36:56 UTC (rev 22773)
+++ pkg/trunk/motion_planning/motion_planning_rviz_plugin/CMakeLists.txt	2009-08-24 22:41:26 UTC (rev 22774)
@@ -16,7 +16,7 @@
 #set the default path for built libraries to the "lib" directory
 set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
 
-rospack_add_library(${PROJECT_NAME} src/planning_display.cpp
+rospack_add_library(${PROJECT_NAME} MODULE src/planning_display.cpp
                                     src/init.cpp)
                                     
 find_package(wxWidgets REQUIRED)

Modified: pkg/trunk/sandbox/mapping_rviz_plugin/CMakeLists.txt
===================================================================
--- pkg/trunk/sandbox/mapping_rviz_plugin/CMakeLists.txt	2009-08-24 22:36:56 UTC (rev 22773)
+++ pkg/trunk/sandbox/mapping_rviz_plugin/CMakeLists.txt	2009-08-24 22:41:26 UTC (rev 22774)
@@ -18,7 +18,7 @@
 #set the default path for built libraries to the "lib" directory
 set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
 
-rospack_add_library(${PROJECT_NAME} src/collision_map_display.cpp
+rospack_add_library(${PROJECT_NAME} MODULE src/collision_map_display.cpp
                                     src/polygonal_map_display.cpp
                                     src/init.cpp)
                                     

Modified: pkg/trunk/stacks/visualization/rviz/manifest.xml
===================================================================
--- pkg/trunk/stacks/visualization/rviz/manifest.xml	2009-08-24 22:36:56 UTC (rev 22773)
+++ pkg/trunk/stacks/visualization/rviz/manifest.xml	2009-08-24 22:41:26 UTC (rev 22774)
@@ -29,7 +29,7 @@
     <depend package="urdf"/>
     <depend package="resource_retriever"/>
     <export> 
-        <cpp cflags="-I${prefix}/src/" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lrviz.so"/>
+        <cpp cflags="-I${prefix}/src/" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lrviz"/>
         <python path="${prefix}/lib/"/>
     </export>
 

Modified: pkg/trunk/stacks/visualization/rviz/src/default_plugin/CMakeLists.txt
===================================================================
--- pkg/trunk/stacks/visualization/rviz/src/default_plugin/CMakeLists.txt	2009-08-24 22:36:56 UTC (rev 22773)
+++ pkg/trunk/stacks/visualization/rviz/src/default_plugin/CMakeLists.txt	2009-08-24 22:41:26 UTC (rev 22774)
@@ -1,6 +1,6 @@
 include_directories(.)
 
-rospack_add_library(default_plugin  markers/marker_selection_handler.cpp
+rospack_add_library(default_plugin MODULE  markers/marker_selection_handler.cpp
                                     markers/marker_base.cpp
                                     markers/shape_marker.cpp
                                     markers/arrow_marker.cpp

Modified: pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/plugin.cpp
===================================================================
--- pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/plugin.cpp	2009-08-24 22:36:56 UTC (rev 22773)
+++ pkg/trunk/stacks/visualization/rviz/src/rviz/plugin/plugin.cpp	2009-08-24 22:41:26 UTC (rev 22774)
@@ -97,8 +97,15 @@
       }
     }
 
-    library_path_ = (p.parent_path() / fs::path((const char*)wxDynamicLibrary::CanonicalizeName(wxString::FromAscii(library.c_str())).char_str())).string();
+    library_path_ = (p.parent_path() / fs::path((const char*)wxDynamicLibrary::CanonicalizeName(wxString::FromAscii(library.c_str()), wxDL_LIBRARY).char_str())).string();
 
+    // wxMac returns .bundle, we want .so for now (until I figure out how to get cmake to build bundles)
+#if __WXMAC__
+    fs::path mac_path(library_path_);
+    mac_path.replace_extension(".so");
+    library_path_ = mac_path.string();
+#endif
+
     doc["name"] >> name_;
 
     const YAML::Node& displays = doc["displays"];


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