From: <ai...@us...> - 2009-05-03 11:15:01
|
Revision: 9889 http://plplot.svn.sourceforge.net/plplot/?rev=9889&view=rev Author: airwin Date: 2009-05-03 11:14:52 +0000 (Sun, 03 May 2009) Log Message: ----------- Use correct rpath command for qt_example and -DENABLE_DYNDRIVERS=OFF case. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-05-03 11:14:05 UTC (rev 9888) +++ trunk/examples/CMakeLists.txt 2009-05-03 11:14:52 UTC (rev 9889) @@ -24,9 +24,13 @@ string(REGEX REPLACE ";" ":" LIB_INSTALL_RPATH "${_LIB_INSTALL_RPATH}") set(RPATHCMD "-Wl,-rpath -Wl,${LIB_INSTALL_RPATH}") if(PLD_extqt) - 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}") + 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}") + else(ENABLE_DYNDRIVERS) + set(qt_RPATHCMD ${RPATHCMD}) + endif(ENABLE_DYNDRIVERS) endif(PLD_extqt) endif(USE_RPATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |