From 30b50ba8d8c7a7299b0f8ee7a538191567cfcd38 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Tue, 17 Mar 2015 18:05:54 +0100
Subject: [PATCH] ENH: don't use DYLD_LIBRARY_PATH
---
SuperBuild/CMake/External_geotiff.cmake | 2 +-
SuperBuild/CMake/External_proj.cmake | 2 +-
SuperBuild/CMakeLists.txt | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/SuperBuild/CMake/External_geotiff.cmake b/SuperBuild/CMake/External_geotiff.cmake
index 880b531030..39a98b09a8 100644
--- a/SuperBuild/CMake/External_geotiff.cmake
+++ b/SuperBuild/CMake/External_geotiff.cmake
@@ -75,7 +75,7 @@ else()
INSTALL_DIR ${SB_INSTALL_PREFIX}
CONFIGURE_COMMAND
# use 'env' because CTest launcher doesn't perform shell interpretation
- env ${LDLIBVAR}=${SB_INSTALL_PREFIX}/lib
+ ${SB_ENV_CONFIGURE_CMD}
${GEOTIFF_SB_BUILD_DIR}/configure
--prefix=${SB_INSTALL_PREFIX}
--enable-static=no
diff --git a/SuperBuild/CMake/External_proj.cmake b/SuperBuild/CMake/External_proj.cmake
index 766753bd36..ce43246545 100644
--- a/SuperBuild/CMake/External_proj.cmake
+++ b/SuperBuild/CMake/External_proj.cmake
@@ -58,7 +58,7 @@ else()
INSTALL_DIR ${SB_INSTALL_PREFIX}
CONFIGURE_COMMAND
# use 'env' because CTest launcher doesn't perform shell interpretation
- env ${LDLIBVAR}=${SB_INSTALL_PREFIX}/lib
+ ${SB_ENV_CONFIGURE_CMD}
${PROJ_SB_BUILD_DIR}/configure
--prefix=${SB_INSTALL_PREFIX}
--enable-static=no
diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt
index fa48798fd6..d7c24fc3ba 100644
--- a/SuperBuild/CMakeLists.txt
+++ b/SuperBuild/CMakeLists.txt
@@ -44,11 +44,12 @@ else(UNIX)
if(APPLE)
set(LDLIBVAR DYLD_LIBRARY_PATH)
set(SB_ENV_CONFIGURE_CMD)
+ set(SB_CMAKE_COMMAND ${CMAKE_COMMAND})
else()
set(LDLIBVAR LD_LIBRARY_PATH)
set(SB_ENV_CONFIGURE_CMD "env ${LDLIBVAR}=${SB_INSTALL_PREFIX}/lib")
+ set(SB_CMAKE_COMMAND env ${LDLIBVAR}=${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_COMMAND})
endif()
- set(SB_CMAKE_COMMAND env ${LDLIBVAR}=${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_COMMAND})
endif()
# Call external projects
--
GitLab