[Plplot-cvs] SF.net SVN: plplot:[12883] trunk

[<ai...@us...>]

Revision: 12883
          http://sourceforge.net/p/plplot/code/12883
Author:   airwin
Date:     2013-12-19 01:35:00 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
Correctly handle rpath issues for builds of all wxwidgets-related PLplot
components.

Modified Paths:
--------------
    trunk/bindings/wxwidgets/CMakeLists.txt
    trunk/cmake/modules/wxwidgets.cmake

Modified: trunk/bindings/wxwidgets/CMakeLists.txt
===================================================================
--- trunk/bindings/wxwidgets/CMakeLists.txt	2013-12-19 01:32:58 UTC (rev 12882)
+++ trunk/bindings/wxwidgets/CMakeLists.txt	2013-12-19 01:35:00 UTC (rev 12883)
@@ -89,6 +89,9 @@
 
   if(USE_RPATH)
     get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
+    list(APPEND LIB_INSTALL_RPATH ${wxwidgets_RPATH})
+    filter_rpath(LIB_INSTALL_RPATH)
+    
     set_target_properties(plplotwxwidgets${LIB_TAG}
       PROPERTIES
       SOVERSION ${plplotwxwidgets_SOVERSION}

Modified: trunk/cmake/modules/wxwidgets.cmake
===================================================================
--- trunk/cmake/modules/wxwidgets.cmake	2013-12-19 01:32:58 UTC (rev 12882)
+++ trunk/cmake/modules/wxwidgets.cmake	2013-12-19 01:35:00 UTC (rev 12883)
@@ -25,6 +25,8 @@
 # 			    device.
 # wxwidgets_LINK_FLAGS	  - list of full path names of libraries and
 # 			    linker flags for dynamic wxwidgets device driver.
+# wxwidgets_RPATH	  - rpath (if needed) for anything linked to the
+#                           wxwidgets libraries.
 # DRIVERS_LINK_FLAGS  	  - list of device LINK_FLAGS for case
 # 			    when ENABLE_DYNDRIVERS OFF.
 
@@ -84,6 +86,12 @@
   message(STATUS "wxWidgets found")
   message(STATUS "wxwidgets_COMPILE_FLAGS = ${wxwidgets_COMPILE_FLAGS}")
   message(STATUS "wxwidgets_LINK_FLAGS = ${wxwidgets_LINK_FLAGS}")
+  set(wxwidgets_RPATH ${wxWidgets_LIBRARY_DIRS})
+  filter_rpath(wxwidgets_RPATH)
+  if(wxwidgets_RPATH)
+    message(STATUS "wxwidgets_RPATH = ${wxwidgets_RPATH}")
+  endif(wxwidgets_RPATH)
+
   if(WITH_FREETYPE)
     include(agg)
     if(HAVE_AGG)

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