|
From: <ai...@us...> - 2013-09-29 20:41:24
|
Revision: 12548
http://sourceforge.net/p/plplot/code/12548
Author: airwin
Date: 2013-09-29 20:41:21 +0000 (Sun, 29 Sep 2013)
Log Message:
-----------
Fix rpath issue (couldn't find shapelib) with qt_example for
traditional build system of installed examples.
Tested by: Alan W. Irwin <ai...@us...> using
scripts/comprehensive_test.sh for case where shapelib had
a non-standard location.
Modified Paths:
--------------
trunk/examples/CMakeLists.txt
Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt 2013-09-29 10:21:53 UTC (rev 12547)
+++ trunk/examples/CMakeLists.txt 2013-09-29 20:41:21 UTC (rev 12548)
@@ -221,7 +221,7 @@
if(ENABLE_DYNDRIVERS)
get_target_property(_qt_INSTALL_RPATH qt INSTALL_RPATH)
string(REGEX REPLACE ";" ":" qt_INSTALL_RPATH "${_qt_INSTALL_RPATH}")
- set(qt_RPATHCMD "-Wl,-rpath -Wl,${qt_INSTALL_RPATH}:${DRV_DIR}")
+ set(qt_RPATHCMD "-Wl,-rpath -Wl,${LIB_INSTALL_RPATH}:${qt_INSTALL_RPATH}:${DRV_DIR}")
else(ENABLE_DYNDRIVERS)
set(qt_RPATHCMD ${RPATHCMD})
endif(ENABLE_DYNDRIVERS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|