[Plplot-cvs] SF.net SVN: plplot:[10775] trunk/src/CMakeLists.txt

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

Revision: 10775
          http://plplot.svn.sourceforge.net/plplot/?rev=10775&view=rev
Author:   airwin
Date:     2010-01-29 22:18:41 +0000 (Fri, 29 Jan 2010)

Log Message:
-----------
Filter /usr/lib out of libplplotd install RPATH.  This is a (hopefully)
temporary workaround until CMake can supply this filtering functionality
(like they currently do for build-tree libraries).  The workaround has only
been applied to libplplotd and every library that uses its rpath.  So the
workaround is probably okay, but theoretically there is a potential issue
for our plug-ins as well (if their special non-plplot external library
dependencies include standard and non-standard library locations).

Modified Paths:
--------------
    trunk/src/CMakeLists.txt

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2010-01-29 09:10:37 UTC (rev 10774)
+++ trunk/src/CMakeLists.txt	2010-01-29 22:18:41 UTC (rev 10775)
@@ -176,7 +176,7 @@
   set(libplplot${LIB_TAG}_LINK_LIBRARIES ${DRIVERS_LINK_FLAGS})
   set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${DRIVERS_RPATH})
 endif(ENABLE_DYNDRIVERS)
-#message("LIB_INSTALL_RPATH = ${LIB_INSTALL_RPATH}")
+#message("DEBUG: LIB_INSTALL_RPATH = ${LIB_INSTALL_RPATH}")
 
 if(MATH_LIB)
   set(
@@ -219,7 +219,8 @@
   include_directories(
     ${QHULL_INCLUDE_DIRS}
     )
-  # Needed by traditional pkg-config approach for installed examples.
+  # Needed by the traditional pkg-config approach for installed examples
+  # as well as the new CMake-based build system for the installed examples.
   set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${QHULL_LIBRARY_DIRS})
 endif(HAVE_QHULL)
 
@@ -279,6 +280,13 @@
   ${libplplot${LIB_TAG}_LINK_LIBRARIES}
   )
 
+# Temporary workaround until this filtering functionality automatically
+# supplied by CMake.
+
+list(REMOVE_DUPLICATES LIB_INSTALL_RPATH)
+list(REMOVE_ITEM LIB_INSTALL_RPATH "/usr/lib")
+message("DEBUG: LIB_INSTALL_RPATH = ${LIB_INSTALL_RPATH}")
+
 if(USE_RPATH)
   set_target_properties(
     plplot${LIB_TAG}


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