diff options
| author | Oscar Fuentes <ofv@wanadoo.es> | 2010-09-25 20:25:25 +0000 |
|---|---|---|
| committer | Oscar Fuentes <ofv@wanadoo.es> | 2010-09-25 20:25:25 +0000 |
| commit | 46d8a9300545b02835d68701e4574fc0a3cae693 (patch) | |
| tree | 4d2e62271d4c2506bae3de8df9b6e13ca4868918 /llvm/utils/unittest | |
| parent | 10117c762a43c796a543b4ec96979b2e40c2619a (diff) | |
| download | bcm5719-llvm-46d8a9300545b02835d68701e4574fc0a3cae693.tar.gz bcm5719-llvm-46d8a9300545b02835d68701e4574fc0a3cae693.zip | |
Reverting "CMake: Don't include tools, unittets, or examples as
available targets unless LLVM_INCLUDE_X is ON. LLVM_BUILD_X implies
LLVM_INCLUDE_X"
It breaks the configuration phase when cmake is invoked without
parameters, it is too complex for the purpose and introduces an
incovenience for the user (as both LLVM_BUILD_X and LLVM_INCLUDE_X
must set to OFF for not including X on the build)
llvm-svn: 114795
Diffstat (limited to 'llvm/utils/unittest')
| -rw-r--r-- | llvm/utils/unittest/CMakeLists.txt | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/llvm/utils/unittest/CMakeLists.txt b/llvm/utils/unittest/CMakeLists.txt index 99741c8f056..70685463014 100644 --- a/llvm/utils/unittest/CMakeLists.txt +++ b/llvm/utils/unittest/CMakeLists.txt @@ -20,17 +20,15 @@ if(WIN32) add_definitions(-DGTEST_OS_WINDOWS=1) endif() -if (LLVM_INCLUDE_TESTS OR LLVM_BUILD_TESTS) - add_llvm_library(gtest - googletest/gtest.cc - googletest/gtest-death-test.cc - googletest/gtest-filepath.cc - googletest/gtest-port.cc - googletest/gtest-test-part.cc - googletest/gtest-typed-test.cc - ) +add_llvm_library(gtest + googletest/gtest.cc + googletest/gtest-death-test.cc + googletest/gtest-filepath.cc + googletest/gtest-port.cc + googletest/gtest-test-part.cc + googletest/gtest-typed-test.cc + ) - add_llvm_library(gtest_main - UnitTestMain/TestMain.cpp - ) -endif() +add_llvm_library(gtest_main + UnitTestMain/TestMain.cpp + ) |
