Merge remote-tracking branch 'origin/release-5.6' into develop

SuperBuild/CMakeLists.txt

@@ -136,28 +136,26 @@ if(UNIX)
   list(APPEND SB_CMAKE_CACHE_ARGS "-DCMAKE_INSTALL_RPATH:PATH=${CMAKE_INSTALL_RPATH}")
 endif()
 
-#RK: not sure we need to pass CC and CXX for all autoconf build
+set(SB_CMAKE_ARGS "-G${CMAKE_GENERATOR}")
 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()
-    set(LDLIBVAR LD_LIBRARY_PATH)
-    #Do we really need to pass LD_LIBRARY_PATH here?
-    set(SB_ENV_CONFIGURE_CMD env ${LDLIBVAR}=${SB_INSTALL_PREFIX}/lib:$ENV{${LDLIBVAR}} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER})
-    #RK: check with GP
-    # set(SB_CMAKE_COMMAND env ${LDLIBVAR}=${CMAKE_INSTALL_PREFIX}/lib:$ENV{${LDLIBVAR}}  CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ${CMAKE_COMMAND})
-    message(STATUS "Environment setup for Configure : ${SB_ENV_CONFIGURE_CMD}")
+    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()
+  message(STATUS "Environment setup for Configure (SB_ENV_CONFIGURE_CMD): ${SB_ENV_CONFIGURE_CMD}")
+else()
+  #windows
+  set(SB_CMAKE_COMMAND ${CMAKE_COMMAND} ${SB_CMAKE_ARGS})
 endif()
-
-
-
-set(SB_CMAKE_ARGS)
-list(APPEND SB_CMAKE_ARGS "-G${CMAKE_GENERATOR}")
-list(APPEND SB_CMAKE_ARGS "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}")
-list(APPEND SB_CMAKE_ARGS "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}")
-
-set(SB_CMAKE_COMMAND ${CMAKE_COMMAND} ${SB_CMAKE_ARGS})
+message(STATUS "Environment setup for CMake (SB_CMAKE_COMMAND) : ${SB_CMAKE_COMMAND}")
 
 set(FROM_SYSTEM_LIST)
 set(FROM_SUPERBUILD_LIST)