diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2012-06-21 01:35:09 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2012-06-21 01:35:09 +0000 |
| commit | 45df6f9e0401903b9eba84e2f90674b0a0dfea56 (patch) | |
| tree | 4d126c4d2c3674354bbc067cada3ea9bf03bc38f | |
| parent | 71b49cb5c73ba912f2fab30f35ed1e43c35a2139 (diff) | |
| download | external_llvm-45df6f9e0401903b9eba84e2f90674b0a0dfea56.zip external_llvm-45df6f9e0401903b9eba84e2f90674b0a0dfea56.tar.gz external_llvm-45df6f9e0401903b9eba84e2f90674b0a0dfea56.tar.bz2 | |
Remove one of the LLVM-specific CMake hacks in favor of standard CMake
facilities.
This was only used in one place in LLVM, and was used pervasively (but
with different code!) in Clang. It has no advantages over the standard
CMake facilities and in some cases disadvantages.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@158889 91177308-0d34-0410-b5e6-96231b3b80d8
| -rwxr-xr-x | cmake/modules/AddLLVM.cmake | 1 | ||||
| -rw-r--r-- | unittests/CMakeLists.txt | 13 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index bfe5127..ea0cc6a 100755 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake @@ -82,7 +82,6 @@ macro(add_llvm_executable name) add_executable(${name} ${ALL_FILES}) endif() set(EXCLUDE_FROM_ALL OFF) - target_link_libraries( ${name} ${LLVM_USED_LIBS} ) llvm_config( ${name} ${LLVM_LINK_COMPONENTS} ) if( LLVM_COMMON_DEPENDS ) add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} ) diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index 43896f5..6af095e 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -10,7 +10,14 @@ function(add_llvm_unittest test_dirname) if( NOT LLVM_BUILD_TESTS ) set(EXCLUDE_FROM_ALL ON) endif() + add_llvm_executable(${test_name}Tests ${ARGN}) + target_link_libraries(${test_name}Tests + gtest + gtest_main + LLVMSupport # gtest needs it for raw_ostream. + ) + add_dependencies(UnitTests ${test_name}Tests) set_target_properties(${test_name}Tests PROPERTIES FOLDER "Tests") endfunction() @@ -51,12 +58,6 @@ set(LLVM_LINK_COMPONENTS Support ) -set(LLVM_USED_LIBS - gtest - gtest_main - LLVMSupport # gtest needs it for raw_ostream. - ) - add_llvm_unittest(ADT ADT/APFloatTest.cpp ADT/APIntTest.cpp |