[llvm-branch-commits] [llvm-branch] r98308 - in /llvm/branches/release_27: ./ test/CMakeLists.txt

[Tanya Lattner]

Author: tbrethou
Date: Thu Mar 11 18:00:12 2010
New Revision: 98308

URL: http://llvm.org/viewvc/llvm-project?rev=98308&view=rev
Log:
Merge 98171 from mainline.
PR6540: Set the newly introduced variables ENABLE_SHARED and
SHLIBPATH_VAR in lit.site.cfg not only in the autoconf build, but also
in a cmake one.


Modified:
    llvm/branches/release_27/   (props changed)
    llvm/branches/release_27/test/CMakeLists.txt

Propchange: llvm/branches/release_27/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 11 18:00:12 2010
@@ -1 +1 @@
-/llvm/trunk:98193,98203,98212
+/llvm/trunk:98171,98193,98203,98212

Modified: llvm/branches/release_27/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_27/test/CMakeLists.txt?rev=98308&r1=98307&r2=98308&view=diff
==============================================================================
--- llvm/branches/release_27/test/CMakeLists.txt (original)
+++ llvm/branches/release_27/test/CMakeLists.txt Thu Mar 11 18:00:12 2010
@@ -7,6 +7,21 @@
 set(LLVM_LIBS_DIR "${LLVM_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}")
 set(SHLIBEXT "${LTDL_SHLIB_EXT}")
 
+if(BUILD_SHARED_LIBS)
+  set(LLVM_SHARED_LIBS_ENABLED "1")
+else()
+  set(LLVM_SHARED_LIBS_ENABLED "0")
+endif(BUILD_SHARED_LIBS)
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  set(SHLIBPATH_VAR "DYLD_LIBRARY_PATH")
+else() # Default for all other unix like systems.
+  # CMake hardcodes the library locaction using rpath.
+  # Therefore LD_LIBRARY_PATH is not required to run binaries in the
+  # build dir. We pass it anyways. 
+  set(SHLIBPATH_VAR "LD_LIBRARY_PATH")
+endif()
+
 include(FindPythonInterp)
 if(PYTHONINTERP_FOUND)
   configure_file(
@@ -27,6 +42,8 @@
                 -e "s#\@LLVM_TOOLS_DIR\@#${LLVM_TOOLS_BINARY_DIR}/${CMAKE_CFG_INTDIR}#"
                 -e "s#\@LLVMGCCDIR\@##"
                 -e "s#\@LLVM_BUILD_MODE\@#${CMAKE_CFG_INTDIR}#"
+                -e "s#\@ENABLE_SHARED\@#${LLVM_SHARED_LIBS_ENABLED}#"
+                -e "s#\@SHLIBPATH_VAR\@#${SHLIBPATH_VAR}#"
                 ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in >
                 ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
     COMMAND ${PYTHON_EXECUTABLE}