From 45df6f9e0401903b9eba84e2f90674b0a0dfea56 Mon Sep 17 00:00:00 2001
From: Chandler Carruth <chandlerc@gmail.com>
Date: Thu, 21 Jun 2012 01:35:09 +0000
Subject: [PATCH] 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
---
cmake/modules/AddLLVM.cmake | 1 -
unittests/CMakeLists.txt | 13 +++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
index bfe5127a4b4..ea0cc6a8620 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 43896f57bbb..6af095e9200 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