diff options
| -rw-r--r-- | llvm/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | llvm/cmake/modules/AddLLVM.cmake | 12 | ||||
| -rw-r--r-- | llvm/cmake/modules/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | llvm/tools/xcode-toolchain/CMakeLists.txt | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index ff21850a5aa..b608d1069be 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -978,7 +978,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) add_custom_target(llvm-headers DEPENDS intrinsics_gen) set_target_properties(llvm-headers PROPERTIES FOLDER "Misc") - if (NOT LLVM_ENABLE_IDE) + if (NOT CMAKE_CONFIGURATION_TYPES) add_llvm_install_targets(install-llvm-headers DEPENDS llvm-headers COMPONENT llvm-headers) @@ -988,7 +988,7 @@ endif() # This must be at the end of the LLVM root CMakeLists file because it must run # after all targets are created. if(LLVM_DISTRIBUTION_COMPONENTS) - if(LLVM_ENABLE_IDE) + if(CMAKE_CONFIGURATION_TYPES) message(FATAL_ERROR "LLVM_DISTRIBUTION_COMPONENTS cannot be specified with multi-configuration generators (i.e. Xcode or Visual Studio)") endif() diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake index 45e744f5e13..97916564cae 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/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/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt index f5cc0006fa0..6c316a2f04f 100644 --- a/llvm/cmake/modules/CMakeLists.txt +++ b/llvm/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 diff --git a/llvm/tools/xcode-toolchain/CMakeLists.txt b/llvm/tools/xcode-toolchain/CMakeLists.txt index 6167f5f6bdd..0ae5e374fe9 100644 --- a/llvm/tools/xcode-toolchain/CMakeLists.txt +++ b/llvm/tools/xcode-toolchain/CMakeLists.txt @@ -100,7 +100,7 @@ add_llvm_install_targets(install-xcode-toolchain PREFIX ${LLVMToolchainDir}/usr/) if(LLVM_DISTRIBUTION_COMPONENTS) - if(LLVM_ENABLE_IDE) + if(CMAKE_CONFIGURATION_TYPES) message(FATAL_ERROR "LLVM_DISTRIBUTION_COMPONENTS cannot be specified with multi-configuration generators (i.e. Xcode or Visual Studio)") endif() |
