From e3aa3f9b25da0de0823aa74a71724c48b9042df2 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Fri, 13 Oct 2017 18:15:00 +0200
Subject: [PATCH] BUG: Mantis-1460: try to avoid usage of LD_LIBRARY_PATH on
Linux SuperBuild
---
SuperBuild/CMakeLists.txt | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt
index bd253df5a9..cf670ba43e 100644
--- a/SuperBuild/CMakeLists.txt
+++ b/SuperBuild/CMakeLists.txt
@@ -222,18 +222,8 @@ else()
endif()
if(UNIX)
- if(APPLE)
- set(SB_CMAKE_COMMAND env CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ${CMAKE_COMMAND} ${SB_CMAKE_ARGS})
- set(SB_ENV_CONFIGURE_CMD env CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER})
- else()
- if( DEFINED ENV{LD_LIBRARY_PATH} )
- set(LD_LIBRARY_PATH_VALUE ${SB_INSTALL_PREFIX}/lib:$ENV{LD_LIBRARY_PATH})
- else()
- set(LD_LIBRARY_PATH_VALUE ${SB_INSTALL_PREFIX}/lib)
- endif()
- set(SB_ENV_CONFIGURE_CMD env LD_LIBRARY_PATH=${LD_LIBRARY_PATH_VALUE} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER})
- set(SB_CMAKE_COMMAND env LD_LIBRARY_PATH=${LD_LIBRARY_PATH_VALUE} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ${CMAKE_COMMAND} ${SB_CMAKE_ARGS})
- endif()
+ set(SB_CMAKE_COMMAND env CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ${CMAKE_COMMAND} ${SB_CMAKE_ARGS})
+ set(SB_ENV_CONFIGURE_CMD env CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER})
message(STATUS "Environment setup for Configure (SB_ENV_CONFIGURE_CMD): ${SB_ENV_CONFIGURE_CMD}")
else()
#windows
--
GitLab