replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Oscar Fuentes 2010-09-25 20:25:25 +00:00
parent 10117c762a
commit 46d8a93005
4 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/CMakeLists.txt
View File

@ -364,18 +364,12 @@ add_subdirectory(lib/Archive)
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)

8
llvm/cmake/modules/AddLLVM.cmake
View File

@ -77,9 +77,7 @@ macro(add_llvm_tool name)
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 @@ macro(add_llvm_example name)
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()

4
llvm/unittests/CMakeLists.txt
View File

@ -9,9 +9,7 @@ function(add_llvm_unittest test_name)
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)

24
llvm/utils/unittest/CMakeLists.txt
View File

@ -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
)