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

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

Revision: 10799
          http://plplot.svn.sourceforge.net/plplot/?rev=10799&view=rev
Author:   airwin
Date:     2010-02-08 19:42:36 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
Use filtered QHULL_RPATH as appropriate.

Get rid of incomplete RPATH filtering here which has been replaced by
complete filtering where all the RPATH related variables are defined in
cmake/modules/*.cmake.

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

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2010-02-08 19:40:17 UTC (rev 10798)
+++ trunk/src/CMakeLists.txt	2010-02-08 19:42:36 UTC (rev 10799)
@@ -211,17 +211,24 @@
     ${libplplot${LIB_TAG}_LINK_LIBRARIES}
     csironn
     )
-  set(
-    libplplot${LIB_TAG}_LINK_FLAGS
-    "${libplplot${LIB_TAG}_LINK_FLAGS} -lcsironn -L${QHULL_LIBRARY_DIRS} -lqhull"
-    )
+  if(QHULL_RPATH)
+    set(
+      libplplot${LIB_TAG}_LINK_FLAGS
+      "${libplplot${LIB_TAG}_LINK_FLAGS} -lcsironn -L${QHULL_PATH} -lqhull"
+      )
+  else(QHULL_RPATH)
+    set(
+      libplplot${LIB_TAG}_LINK_FLAGS
+      "${libplplot${LIB_TAG}_LINK_FLAGS} -lcsironn -lqhull"
+      )
+  endif(QHULL_RPATH)
   # Needed by plgridd.c.
   include_directories(
     ${QHULL_INCLUDE_DIRS}
     )
   # 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})
+  set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${QHULL_RPATH})
 endif(HAVE_QHULL)
 
 if(NOT ENABLE_DYNDRIVERS AND PLD_cgm)
@@ -280,17 +287,6 @@
   ${libplplot${LIB_TAG}_LINK_LIBRARIES}
   )
 
-# Temporary crude workaround until this run-time default library location
-# filtering functionality (which is bound to vary from platform to platform)
-# is automatically supplied by CMake.  Note this only fixes the issue
-# for libplplotd and the libraries and plugins that depend on it, 
-# but does not fix the issue for, e.g., other mixtures of shared
-# libraries that driver plug-ins might depend upon.
-
-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.