[llvm-commits] [llvm] r114795 - in /llvm/trunk: CMakeLists.txt cmake/modules/AddLLVM.cmake unittests/CMakeLists.txt utils/unittest/CMakeLists.txt

[Oscar Fuentes]

Author: ofv
Date: Sat Sep 25 15:25:25 2010
New Revision: 114795

URL: http://llvm.org/viewvc/llvm-project?rev=114795&view=rev
Log:
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)

Modified:
    llvm/trunk/CMakeLists.txt
    llvm/trunk/cmake/modules/AddLLVM.cmake
    llvm/trunk/unittests/CMakeLists.txt
    llvm/trunk/utils/unittest/CMakeLists.txt

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=114795&r1=114794&r2=114795&view=diff
==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Sat Sep 25 15:25:25 2010
@@ -364,18 +364,12 @@
 add_subdirectory(projects)
 
 option(LLVM_BUILD_TOOLS "Build LLVM tool programs." ON)
-option(LLVM_INCLUDE_TOOLS
-  "Include LLVM tool programs as an available target." ON)
 add_subdirectory(tools)
 
 option(LLVM_BUILD_EXAMPLES "Build LLVM example programs." OFF)
-option(LLVM_INCLUDE_EXAMPLES
-  "Include LLVM example programs as an available target." OFF)
 add_subdirectory(examples)
 
 option(LLVM_BUILD_TESTS "Build LLVM unit tests." OFF)
-option(LLVM_INCLUDE_TESTS
-  "Include LLVM unit tests as an available target." OFF)
 add_subdirectory(test)
 add_subdirectory(utils/unittest)
 add_subdirectory(unittests)

Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=114795&r1=114794&r2=114795&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Sat Sep 25 15:25:25 2010
@@ -77,9 +77,7 @@
   if( NOT LLVM_BUILD_TOOLS )
     set(EXCLUDE_FROM_ALL ON)
   endif()
-  if( LLVM_INCLUDE_TOOLS OR LLVM_BUILD_TOOLS )
-    add_llvm_executable(${name} ${ARGN})
-  endif()
+  add_llvm_executable(${name} ${ARGN})
   if( LLVM_BUILD_TOOLS )
     install(TARGETS ${name} RUNTIME DESTINATION bin)
   endif()
@@ -91,9 +89,7 @@
   if( NOT LLVM_BUILD_EXAMPLES )
     set(EXCLUDE_FROM_ALL ON)
   endif()
-  if( LLVM_INCLUDE_EXAMPLES OR LLVM_BUILD_EXAMPLES )
-    add_llvm_executable(${name} ${ARGN})
-  endif()
+  add_llvm_executable(${name} ${ARGN})
   if( LLVM_BUILD_EXAMPLES )
     install(TARGETS ${name} RUNTIME DESTINATION examples)
   endif()

Modified: llvm/trunk/unittests/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/CMakeLists.txt?rev=114795&r1=114794&r2=114795&view=diff
==============================================================================
--- llvm/trunk/unittests/CMakeLists.txt (original)
+++ llvm/trunk/unittests/CMakeLists.txt Sat Sep 25 15:25:25 2010
@@ -9,9 +9,7 @@
   if( NOT LLVM_BUILD_TESTS )
     set(EXCLUDE_FROM_ALL ON)
   endif()
-  if (LLVM_INCLUDE_TESTS OR LLVM_BUILD_TESTS)
-    add_llvm_executable(${test_name}Tests ${ARGN})
-  endif()
+  add_llvm_executable(${test_name}Tests ${ARGN})
 endfunction()
 
 include_directories(${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include)

Modified: llvm/trunk/utils/unittest/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/CMakeLists.txt?rev=114795&r1=114794&r2=114795&view=diff
==============================================================================
--- llvm/trunk/utils/unittest/CMakeLists.txt (original)
+++ llvm/trunk/utils/unittest/CMakeLists.txt Sat Sep 25 15:25:25 2010
@@ -20,17 +20,15 @@
   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
+  )