diff options
| author | Jonas Hahnfeld <Hahnfeld@itc.rwth-aachen.de> | 2016-11-03 06:58:16 +0000 |
|---|---|---|
| committer | Jonas Hahnfeld <Hahnfeld@itc.rwth-aachen.de> | 2016-11-03 06:58:16 +0000 |
| commit | 277a09d9fad06ac2ef69c589e1053e00a5075718 (patch) | |
| tree | da311e6eb3cf4c60daaef47efb7262c8b0f66203 | |
| parent | e03e5953f6094901468708dce02a2d8dc76c1f2a (diff) | |
| download | bcm5719-llvm-277a09d9fad06ac2ef69c589e1053e00a5075718.tar.gz bcm5719-llvm-277a09d9fad06ac2ef69c589e1053e00a5075718.zip | |
[CMake] Disable rpath for UnitTests
This was broken since rL285714.
Differential Revision: https://reviews.llvm.org/D26246
llvm-svn: 285881
| -rw-r--r-- | llvm/cmake/modules/AddLLVM.cmake | 8 | ||||
| -rw-r--r-- | llvm/unittests/CMakeLists.txt | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake index db2f31c5654..32ef66ab7c4 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake @@ -632,7 +632,7 @@ endmacro(add_llvm_loadable_module name) macro(add_llvm_executable name) - cmake_parse_arguments(ARG "DISABLE_LLVM_LINK_LLVM_DYLIB;IGNORE_EXTERNALIZE_DEBUGINFO" "" "" ${ARGN}) + cmake_parse_arguments(ARG "DISABLE_LLVM_LINK_LLVM_DYLIB;IGNORE_EXTERNALIZE_DEBUGINFO;NO_INSTALL_RPATH" "" "" ${ARGN}) llvm_process_sources( ALL_FILES ${ARG_UNPARSED_ARGUMENTS} ) # Generate objlib @@ -662,7 +662,9 @@ macro(add_llvm_executable name) add_executable(${name} ${ALL_FILES}) endif() - llvm_setup_rpath(${name}) + if(NOT ARG_NO_INSTALL_RPATH) + llvm_setup_rpath(${name}) + endif() if(DEFINED windows_resource_file) set_windows_version_resource_properties(${name} ${windows_resource_file}) @@ -990,7 +992,7 @@ function(add_unittest test_suite test_name) set(LLVM_REQUIRES_RTTI OFF) list(APPEND LLVM_LINK_COMPONENTS Support) # gtest needs it for raw_ostream - add_llvm_executable(${test_name} IGNORE_EXTERNALIZE_DEBUGINFO ${ARGN}) + add_llvm_executable(${test_name} IGNORE_EXTERNALIZE_DEBUGINFO NO_INSTALL_RPATH ${ARGN}) set(outdir ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}) set_output_directory(${test_name} BINARY_DIR ${outdir} LIBRARY_DIR ${outdir}) # libpthreads overrides some standard library symbols, so main diff --git a/llvm/unittests/CMakeLists.txt b/llvm/unittests/CMakeLists.txt index 67cf8bbd6ba..6caed0e5d19 100644 --- a/llvm/unittests/CMakeLists.txt +++ b/llvm/unittests/CMakeLists.txt @@ -1,10 +1,6 @@ add_custom_target(UnitTests) set_target_properties(UnitTests PROPERTIES FOLDER "Tests") -# People tend to run the tests _before_ installing, so we don't want the install -# rpath here. -set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) - function(add_llvm_unittest test_dirname) add_unittest(UnitTests ${test_dirname} ${ARGN}) endfunction() |
