|
From: <ai...@us...> - 2013-12-17 01:15:28
|
Revision: 12870
http://sourceforge.net/p/plplot/code/12870
Author: airwin
Date: 2013-12-17 01:15:22 +0000 (Tue, 17 Dec 2013)
Log Message:
-----------
Set rpath so that when the epa_build version of swig is loaded by the
run-time loader, the epa_build version of libpcre is found.
Modified Paths:
--------------
trunk/cmake/epa_build/swig/CMakeLists.txt
Modified: trunk/cmake/epa_build/swig/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/swig/CMakeLists.txt 2013-12-16 23:51:43 UTC (rev 12869)
+++ trunk/cmake/epa_build/swig/CMakeLists.txt 2013-12-17 01:15:22 UTC (rev 12870)
@@ -68,7 +68,7 @@
DEPENDS ${dependencies_targets}
URL ${URL}
URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --with-pcre-prefix=${EPA_CMAKE_INSTALL_PREFIX}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" "LDFLAGS=-Wl,-rpath -Wl,${EPA_CMAKE_INSTALL_PREFIX}/lib" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --with-pcre-prefix=${EPA_CMAKE_INSTALL_PREFIX}
BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
BUILD_IN_SOURCE OFF
INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|