X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FCMakeLists.txt;h=ab060c91a582608456c37aafabd357d3d195751e;hb=295cdf8b8293f31953bad9a4a9c0586e934181c6;hp=5ad48eff4e7dd6cf7ec2943ed85d275d9c28ce82;hpb=aefd63d4158cc80f1de909db38f9c97bdb399b75;p=oota-llvm.git

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5ad48eff4e7..ab060c91a58 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -7,6 +7,21 @@ set(TARGETS_TO_BUILD ${TARGETS_BUILT})
 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 @@ if(PYTHONINTERP_FOUND)
                 -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}