Revision: 10171
http://plplot.svn.sourceforge.net/plplot/?rev=10171&view=rev
Author: airwin
Date: 2009-07-20 21:59:01 +0000 (Mon, 20 Jul 2009)
Log Message:
-----------
Handle the install rpath for libplplotqt(d).so the same way it is done for
qt.so.
The order is
(1) installed PLplot location,
(2) Qt location,
(3) Special rpath location for libplplot(d) which currently is the
location for libltdl (normally but not always the system location [/usr/lib
on Linux]).
If (1) is the system location,then qt and libltdl will also be taken from
the system location if they exist there. However, this should usually not
be a problem since this case normally only occurs when all locations are
system locations.
If (2) is the system location, then libltdl will also be taken from
the system location if that exists. This is probably not a major issue.
The correct way to solve this is to exclude system locations from rpath
locations, and presumably that can be done using the NO_CMAKE_SYSTEM_PATH
signature for find_library, but I haven't tried that since for now the
present RPATH order should be good enough for most purposes.
Modified Paths:
--------------
trunk/bindings/qt_gui/CMakeLists.txt
Modified: trunk/bindings/qt_gui/CMakeLists.txt
===================================================================
--- trunk/bindings/qt_gui/CMakeLists.txt 2009-07-20 21:32:08 UTC (rev 10170)
+++ trunk/bindings/qt_gui/CMakeLists.txt 2009-07-20 21:59:01 UTC (rev 10171)
@@ -97,11 +97,15 @@
# qt_RPATH set in cmake/modules/qt.cmake. This is only used for the
# install-tree rpath since cmake handles the build-tree rpath
# automatically (so long as full pathnames to libraries are used).
- # message("qt_RPATH = ${qt_RPATH}")
+ #message("qt_RPATH = ${qt_RPATH}")
if(USE_RPATH)
- get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
- # Must prepend qt_RPATH because /usr/lib is sometimes in LIB_INSTALL_RPATH.
- set(LIB_INSTALL_RPATH ${qt_RPATH} ${LIB_INSTALL_RPATH})
+ # Order is important here because of /usr/lib concerns.
+ set(LIB_INSTALL_RPATH
+ ${LIB_DIR}
+ ${qt_RPATH}
+ ${libplplot${LIB_TAG}_RPATH}
+ )
+ #message("LIB_INSTALL_RPATH = ${LIB_INSTALL_RPATH}")
set_target_properties(plplotqt${LIB_TAG}
PROPERTIES
SOVERSION ${plplotqt_SOVERSION}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|