From 066de857f813991cb8985c7b10e130b32c878bd6 Mon Sep 17 00:00:00 2001 From: Oscar Fuentes Date: Sat, 25 Sep 2010 20:25:25 +0000 Subject: 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) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@114795 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/unittest/CMakeLists.txt | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'utils/unittest/CMakeLists.txt') diff --git a/utils/unittest/CMakeLists.txt b/utils/unittest/CMakeLists.txt index 99741c8f05..7068546301 100644 --- a/utils/unittest/CMakeLists.txt +++ b/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 + ) -- cgit v1.2.3-18-g5258