RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-18 18:42:46 +02:00
Code Issues Projects Releases Wiki Activity

Revert "[CMake] Use LLVM_ENABLE_IDE instead of CMAKE_CONFIGURATION_TYPES"

Browse Source 
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.

llvm-svn: 341045
This commit is contained in:
Roman Lebedev 2018-08-30 09:32:09 +00:00
parent b83b70f6e9
commit 3ff355fa36
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -978,7 +978,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
add_custom_target(llvm-headers DEPENDS intrinsics_gen) add_custom_target(llvm-headers DEPENDS intrinsics_gen)
set_target_properties(llvm-headers PROPERTIES FOLDER "Misc") 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 add_llvm_install_targets(install-llvm-headers
DEPENDS llvm-headers DEPENDS llvm-headers
COMPONENT 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 # This must be at the end of the LLVM root CMakeLists file because it must run
# after all targets are created. # after all targets are created.
if(LLVM_DISTRIBUTION_COMPONENTS) 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)") message(FATAL_ERROR "LLVM_DISTRIBUTION_COMPONENTS cannot be specified with multi-configuration generators (i.e. Xcode or Visual Studio)")
endif() endif()

12
cmake/modules/AddLLVM.cmake
View File

@ -659,7 +659,7 @@ macro(add_llvm_library name)
${install_type} DESTINATION ${install_dir} ${install_type} DESTINATION ${install_dir}
COMPONENT ${name}) COMPONENT ${name})
if (NOT LLVM_ENABLE_IDE) if (NOT CMAKE_CONFIGURATION_TYPES)
add_llvm_install_targets(install-${name} add_llvm_install_targets(install-${name}
DEPENDS ${name} DEPENDS ${name}
COMPONENT ${name}) COMPONENT ${name})
@ -890,7 +890,7 @@ macro(add_llvm_tool name)
RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR} RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR}
COMPONENT ${name}) COMPONENT ${name})
if (NOT LLVM_ENABLE_IDE) if (NOT CMAKE_CONFIGURATION_TYPES)
add_llvm_install_targets(install-${name} add_llvm_install_targets(install-${name}
DEPENDS ${name} DEPENDS ${name}
COMPONENT ${name}) COMPONENT ${name})
@ -928,7 +928,7 @@ macro(add_llvm_utility name)
install (TARGETS ${name} install (TARGETS ${name}
RUNTIME DESTINATION ${LLVM_UTILS_INSTALL_DIR} RUNTIME DESTINATION ${LLVM_UTILS_INSTALL_DIR}
COMPONENT ${name}) COMPONENT ${name})
if (NOT LLVM_ENABLE_IDE) if (NOT CMAKE_CONFIGURATION_TYPES)
add_llvm_install_targets(install-${name} add_llvm_install_targets(install-${name}
DEPENDS ${name} DEPENDS ${name}
COMPONENT ${name}) COMPONENT ${name})
@ -1390,7 +1390,7 @@ function(add_lit_testsuite target comment)
endfunction() endfunction()
function(add_lit_testsuites project directory) function(add_lit_testsuites project directory)
if (NOT LLVM_ENABLE_IDE) if (NOT CMAKE_CONFIGURATION_TYPES)
cmake_parse_arguments(ARG "" "" "PARAMS;DEPENDS;ARGS" ${ARGN}) cmake_parse_arguments(ARG "" "" "PARAMS;DEPENDS;ARGS" ${ARGN})
# Search recursively for test directories by assuming anything not # 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})" CODE "install_symlink(${full_name} ${full_dest} ${output_dir})"
COMPONENT ${component}) 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} add_llvm_install_targets(install-${name}
DEPENDS ${name} ${dest} install-${dest} DEPENDS ${name} ${dest} install-${dest}
COMPONENT ${name}) COMPONENT ${name})
@ -1482,7 +1482,7 @@ function(llvm_install_symlink name dest)
CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})" CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})"
COMPONENT ${component}) 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} add_llvm_install_targets(install-${name}
DEPENDS ${name} ${dest} install-${dest} DEPENDS ${name} ${dest} install-${dest}
COMPONENT ${name}) COMPONENT ${name})

2
cmake/modules/CMakeLists.txt
View File

@ -132,7 +132,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
PATTERN LLVM-Config.cmake EXCLUDE PATTERN LLVM-Config.cmake EXCLUDE
PATTERN GetHostTriple.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 a dummy target so this can be used with LLVM_DISTRIBUTION_COMPONENTS
add_custom_target(cmake-exports) add_custom_target(cmake-exports)
add_llvm_install_targets(install-cmake-exports add_llvm_install_targets(install-cmake-exports

2
tools/xcode-toolchain/CMakeLists.txt
View File

@ -100,7 +100,7 @@ add_llvm_install_targets(install-xcode-toolchain
PREFIX ${LLVMToolchainDir}/usr/) PREFIX ${LLVMToolchainDir}/usr/)
if(LLVM_DISTRIBUTION_COMPONENTS) 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)") message(FATAL_ERROR "LLVM_DISTRIBUTION_COMPONENTS cannot be specified with multi-configuration generators (i.e. Xcode or Visual Studio)")
endif() endif()