diff options
| author | Oscar Fuentes <ofv@wanadoo.es> | 2011-02-05 19:08:42 +0000 |
|---|---|---|
| committer | Oscar Fuentes <ofv@wanadoo.es> | 2011-02-05 19:08:42 +0000 |
| commit | 3522179e36de49752b445964ca5d6fad627f2d35 (patch) | |
| tree | e50ed934140646441d97bd0f9f05d46ac35deaa0 | |
| parent | 73f97534b04ff9c656ea4665a3c24efe21478e44 (diff) | |
| download | bcm5719-llvm-3522179e36de49752b445964ca5d6fad627f2d35.tar.gz bcm5719-llvm-3522179e36de49752b445964ca5d6fad627f2d35.zip | |
Moved more stuff to HandleLLVMOptions.cmake
llvm-svn: 124968
| -rw-r--r-- | llvm/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | llvm/cmake/modules/HandleLLVMOptions.cmake | 21 |
2 files changed, 21 insertions, 21 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index e436c1c757c..41f41411405 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -34,20 +34,6 @@ This process created the file `CMakeCache.txt' and the directory `CMakeFiles'. Please delete them.") endif() -# Run-time build mode; It is used for unittests. -if(MSVC_IDE) - # Expect "$(Configuration)", "$(OutDir)", etc. - # It is expanded by msbuild or similar. - set(RUNTIME_BUILD_MODE "${CMAKE_CFG_INTDIR}") -elseif(NOT CMAKE_BUILD_TYPE STREQUAL "") - # Expect "Release" "Debug", etc. - # Or unittests could not run. - set(RUNTIME_BUILD_MODE ${CMAKE_BUILD_TYPE}) -else() - # It might be "." - set(RUNTIME_BUILD_MODE "${CMAKE_CFG_INTDIR}") -endif() - string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) set(LLVM_MAIN_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}) @@ -118,13 +104,6 @@ set(FFI_INCLUDE_DIR "" CACHE PATH "Additional directory, where CMake should sear set(LLVM_TARGET_ARCH "host" CACHE STRING "Set target to use for LLVM JIT or use \"host\" for automatic detection.") -set(LIT_ARGS_DEFAULT "-sv") -if (MSVC OR XCODE) - set(LIT_ARGS_DEFAULT "${LIT_ARGS_DEFAULT} --no-progress-bar") -endif() -set(LLVM_LIT_ARGS "${LIT_ARGS_DEFAULT}" - CACHE STRING "Default options for lit") - option(LLVM_ENABLE_THREADS "Use threads if available." ON) if( LLVM_TARGETS_TO_BUILD STREQUAL "all" ) diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake index ed3e366ef21..d4096e25933 100644 --- a/llvm/cmake/modules/HandleLLVMOptions.cmake +++ b/llvm/cmake/modules/HandleLLVMOptions.cmake @@ -1,5 +1,26 @@ include(AddLLVMDefinitions) +# Run-time build mode; It is used for unittests. +if(MSVC_IDE) + # Expect "$(Configuration)", "$(OutDir)", etc. + # It is expanded by msbuild or similar. + set(RUNTIME_BUILD_MODE "${CMAKE_CFG_INTDIR}") +elseif(NOT CMAKE_BUILD_TYPE STREQUAL "") + # Expect "Release" "Debug", etc. + # Or unittests could not run. + set(RUNTIME_BUILD_MODE ${CMAKE_BUILD_TYPE}) +else() + # It might be "." + set(RUNTIME_BUILD_MODE "${CMAKE_CFG_INTDIR}") +endif() + +set(LIT_ARGS_DEFAULT "-sv") +if (MSVC OR XCODE) + set(LIT_ARGS_DEFAULT "${LIT_ARGS_DEFAULT} --no-progress-bar") +endif() +set(LLVM_LIT_ARGS "${LIT_ARGS_DEFAULT}" + CACHE STRING "Default options for lit") + if( LLVM_ENABLE_ASSERTIONS ) # MSVC doesn't like _DEBUG on release builds. See PR 4379. if( NOT MSVC ) |
