diff options
| author | Roman Lebedev <lebedev.ri@gmail.com> | 2018-08-30 09:32:09 +0000 |
|---|---|---|
| committer | Roman Lebedev <lebedev.ri@gmail.com> | 2018-08-30 09:32:09 +0000 |
| commit | 2550ec0d3b7860fd7f6f602add44369d078d9362 (patch) | |
| tree | df5020fd96a0f5a63d968d49afae6e0a889a29c9 /cmake | |
| parent | 009ed30f63308216f722ffc98b04a79d71459962 (diff) | |
Revert "[CMake] Use LLVM_ENABLE_IDE instead of CMAKE_CONFIGURATION_TYPES"
That resulted in the check-llvm-* targets not being avaliable
in the QtCreator-configured build directories.
Moreover, that was a clearly non-NFC change, and i can't find any review
for it.
This reverts commit rL340435.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@341045 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/AddLLVM.cmake | 12 | ||||
| -rw-r--r-- | cmake/modules/CMakeLists.txt | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index 45e744f5e13..97916564cae 100644 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake @@ -659,7 +659,7 @@ macro(add_llvm_library name) ${install_type} DESTINATION ${install_dir} COMPONENT ${name}) - if (NOT LLVM_ENABLE_IDE) + if (NOT CMAKE_CONFIGURATION_TYPES) add_llvm_install_targets(install-${name} DEPENDS ${name} COMPONENT ${name}) @@ -890,7 +890,7 @@ macro(add_llvm_tool name) RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR} COMPONENT ${name}) - if (NOT LLVM_ENABLE_IDE) + if (NOT CMAKE_CONFIGURATION_TYPES) add_llvm_install_targets(install-${name} DEPENDS ${name} COMPONENT ${name}) @@ -928,7 +928,7 @@ macro(add_llvm_utility name) install (TARGETS ${name} RUNTIME DESTINATION ${LLVM_UTILS_INSTALL_DIR} COMPONENT ${name}) - if (NOT LLVM_ENABLE_IDE) + if (NOT CMAKE_CONFIGURATION_TYPES) add_llvm_install_targets(install-${name} DEPENDS ${name} COMPONENT ${name}) @@ -1390,7 +1390,7 @@ function(add_lit_testsuite target comment) endfunction() function(add_lit_testsuites project directory) - if (NOT LLVM_ENABLE_IDE) + if (NOT CMAKE_CONFIGURATION_TYPES) cmake_parse_arguments(ARG "" "" "PARAMS;DEPENDS;ARGS" ${ARGN}) # Search recursively for test directories by assuming anything not @@ -1449,7 +1449,7 @@ function(llvm_install_library_symlink name dest type) CODE "install_symlink(${full_name} ${full_dest} ${output_dir})" COMPONENT ${component}) - if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE) + if (NOT CMAKE_CONFIGURATION_TYPES AND NOT ARG_ALWAYS_GENERATE) add_llvm_install_targets(install-${name} DEPENDS ${name} ${dest} install-${dest} COMPONENT ${name}) @@ -1482,7 +1482,7 @@ function(llvm_install_symlink name dest) CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})" COMPONENT ${component}) - if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE) + if (NOT CMAKE_CONFIGURATION_TYPES AND NOT ARG_ALWAYS_GENERATE) add_llvm_install_targets(install-${name} DEPENDS ${name} ${dest} install-${dest} COMPONENT ${name}) diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt index f5cc0006fa0..6c316a2f04f 100644 --- a/cmake/modules/CMakeLists.txt +++ b/cmake/modules/CMakeLists.txt @@ -132,7 +132,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) PATTERN LLVM-Config.cmake EXCLUDE PATTERN GetHostTriple.cmake EXCLUDE) - if (NOT LLVM_ENABLE_IDE) + if (NOT CMAKE_CONFIGURATION_TYPES) # Add a dummy target so this can be used with LLVM_DISTRIBUTION_COMPONENTS add_custom_target(cmake-exports) add_llvm_install_targets(install-cmake-exports |