llvm.org GIT mirror llvm / 2550ec0
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 Roman Lebedev 11 months ago
4 changed file(s) with 10 addition(s) and 10 deletion(s). Raw diff Collapse all Expand all
977977 add_custom_target(llvm-headers DEPENDS intrinsics_gen)
978978 set_target_properties(llvm-headers PROPERTIES FOLDER "Misc")
979979
980 if (NOT LLVM_ENABLE_IDE)
980 if (NOT CMAKE_CONFIGURATION_TYPES)
981981 add_llvm_install_targets(install-llvm-headers
982982 DEPENDS llvm-headers
983983 COMPONENT llvm-headers)
987987 # This must be at the end of the LLVM root CMakeLists file because it must run
988988 # after all targets are created.
989989 if(LLVM_DISTRIBUTION_COMPONENTS)
990 if(LLVM_ENABLE_IDE)
990 if(CMAKE_CONFIGURATION_TYPES)
991991 message(FATAL_ERROR "LLVM_DISTRIBUTION_COMPONENTS cannot be specified with multi-configuration generators (i.e. Xcode or Visual Studio)")
992992 endif()
993993
658658 ${install_type} DESTINATION ${install_dir}
659659 COMPONENT ${name})
660660
661 if (NOT LLVM_ENABLE_IDE)
661 if (NOT CMAKE_CONFIGURATION_TYPES)
662662 add_llvm_install_targets(install-${name}
663663 DEPENDS ${name}
664664 COMPONENT ${name})
889889 RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR}
890890 COMPONENT ${name})
891891
892 if (NOT LLVM_ENABLE_IDE)
892 if (NOT CMAKE_CONFIGURATION_TYPES)
893893 add_llvm_install_targets(install-${name}
894894 DEPENDS ${name}
895895 COMPONENT ${name})
927927 install (TARGETS ${name}
928928 RUNTIME DESTINATION ${LLVM_UTILS_INSTALL_DIR}
929929 COMPONENT ${name})
930 if (NOT LLVM_ENABLE_IDE)
930 if (NOT CMAKE_CONFIGURATION_TYPES)
931931 add_llvm_install_targets(install-${name}
932932 DEPENDS ${name}
933933 COMPONENT ${name})
13891389 endfunction()
13901390
13911391 function(add_lit_testsuites project directory)
1392 if (NOT LLVM_ENABLE_IDE)
1392 if (NOT CMAKE_CONFIGURATION_TYPES)
13931393 cmake_parse_arguments(ARG "" "" "PARAMS;DEPENDS;ARGS" ${ARGN})
13941394
13951395 # Search recursively for test directories by assuming anything not
14481448 CODE "install_symlink(${full_name} ${full_dest} ${output_dir})"
14491449 COMPONENT ${component})
14501450
1451 if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE)
1451 if (NOT CMAKE_CONFIGURATION_TYPES AND NOT ARG_ALWAYS_GENERATE)
14521452 add_llvm_install_targets(install-${name}
14531453 DEPENDS ${name} ${dest} install-${dest}
14541454 COMPONENT ${name})
14811481 CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})"
14821482 COMPONENT ${component})
14831483
1484 if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE)
1484 if (NOT CMAKE_CONFIGURATION_TYPES AND NOT ARG_ALWAYS_GENERATE)
14851485 add_llvm_install_targets(install-${name}
14861486 DEPENDS ${name} ${dest} install-${dest}
14871487 COMPONENT ${name})
131131 PATTERN LLVM-Config.cmake EXCLUDE
132132 PATTERN GetHostTriple.cmake EXCLUDE)
133133
134 if (NOT LLVM_ENABLE_IDE)
134 if (NOT CMAKE_CONFIGURATION_TYPES)
135135 # Add a dummy target so this can be used with LLVM_DISTRIBUTION_COMPONENTS
136136 add_custom_target(cmake-exports)
137137 add_llvm_install_targets(install-cmake-exports
9999 PREFIX ${LLVMToolchainDir}/usr/)
100100
101101 if(LLVM_DISTRIBUTION_COMPONENTS)
102 if(LLVM_ENABLE_IDE)
102 if(CMAKE_CONFIGURATION_TYPES)
103103 message(FATAL_ERROR "LLVM_DISTRIBUTION_COMPONENTS cannot be specified with multi-configuration generators (i.e. Xcode or Visual Studio)")
104104 endif()
105105