Author: smeenai Date: Wed Feb 20 15:08:43 2019 New Revision: 354525 URL: http://llvm.org/viewvc/llvm-project?rev=354525&view=rev Log: [clang] Switch to LLVM_ENABLE_IDE
r344555 switched LLVM to guarding install targets with LLVM_ENABLE_IDE instead of CMAKE_CONFIGURATION_TYPES, which expresses the intent more directly and can be overridden by a user. Make the corresponding change in clang. LLVM_ENABLE_IDE is computed by HandleLLVMOptions, so it should be available for both standalone and integrated builds. Differential Revision: https://reviews.llvm.org/D58284 Modified: cfe/trunk/CMakeLists.txt cfe/trunk/cmake/modules/AddClang.cmake cfe/trunk/lib/Headers/CMakeLists.txt cfe/trunk/tools/c-index-test/CMakeLists.txt cfe/trunk/tools/diagtool/CMakeLists.txt cfe/trunk/tools/libclang/CMakeLists.txt Modified: cfe/trunk/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/CMakeLists.txt?rev=354525&r1=354524&r2=354525&view=diff ============================================================================== --- cfe/trunk/CMakeLists.txt (original) +++ cfe/trunk/CMakeLists.txt Wed Feb 20 15:08:43 2019 @@ -552,7 +552,7 @@ endif() add_custom_target(clang-libraries) set_target_properties(clang-libraries PROPERTIES FOLDER "Misc") -if(NOT CMAKE_CONFIGURATION_TYPES) +if(NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-clang-libraries DEPENDS clang-libraries COMPONENT clang-libraries) @@ -563,7 +563,7 @@ if(CLANG_LIBS) list(REMOVE_DUPLICATES CLANG_LIBS) foreach(lib ${CLANG_LIBS}) add_dependencies(clang-libraries ${lib}) - if(NOT CMAKE_CONFIGURATION_TYPES) + if(NOT LLVM_ENABLE_IDE) add_dependencies(install-clang-libraries install-${lib}) endif() endforeach() Modified: cfe/trunk/cmake/modules/AddClang.cmake URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/cmake/modules/AddClang.cmake?rev=354525&r1=354524&r2=354525&view=diff ============================================================================== --- cfe/trunk/cmake/modules/AddClang.cmake (original) +++ cfe/trunk/cmake/modules/AddClang.cmake Wed Feb 20 15:08:43 2019 @@ -103,7 +103,7 @@ macro(add_clang_library name) ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} RUNTIME DESTINATION bin) - if (NOT CMAKE_CONFIGURATION_TYPES) + if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-${name} DEPENDS ${name} COMPONENT ${name}) @@ -147,7 +147,7 @@ macro(add_clang_tool name) RUNTIME DESTINATION bin COMPONENT ${name}) - if(NOT CMAKE_CONFIGURATION_TYPES) + if(NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-${name} DEPENDS ${name} COMPONENT ${name}) Modified: cfe/trunk/lib/Headers/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/CMakeLists.txt?rev=354525&r1=354524&r2=354525&view=diff ============================================================================== --- cfe/trunk/lib/Headers/CMakeLists.txt (original) +++ cfe/trunk/lib/Headers/CMakeLists.txt Wed Feb 20 15:08:43 2019 @@ -178,7 +178,7 @@ install( PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) -if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's. +if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-clang-headers DEPENDS clang-headers COMPONENT clang-headers) Modified: cfe/trunk/tools/c-index-test/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/c-index-test/CMakeLists.txt?rev=354525&r1=354524&r2=354525&view=diff ============================================================================== --- cfe/trunk/tools/c-index-test/CMakeLists.txt (original) +++ cfe/trunk/tools/c-index-test/CMakeLists.txt Wed Feb 20 15:08:43 2019 @@ -61,7 +61,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) RUNTIME DESTINATION "${INSTALL_DESTINATION}" COMPONENT c-index-test) - if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's. + if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-c-index-test DEPENDS c-index-test COMPONENT c-index-test) Modified: cfe/trunk/tools/diagtool/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/diagtool/CMakeLists.txt?rev=354525&r1=354524&r2=354525&view=diff ============================================================================== --- cfe/trunk/tools/diagtool/CMakeLists.txt (original) +++ cfe/trunk/tools/diagtool/CMakeLists.txt Wed Feb 20 15:08:43 2019 @@ -23,7 +23,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) COMPONENT diagtool RUNTIME DESTINATION bin) - if (NOT CMAKE_CONFIGURATION_TYPES) + if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-diagtool DEPENDS diagtool COMPONENT diagtool) Modified: cfe/trunk/tools/libclang/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CMakeLists.txt?rev=354525&r1=354524&r2=354525&view=diff ============================================================================== --- cfe/trunk/tools/libclang/CMakeLists.txt (original) +++ cfe/trunk/tools/libclang/CMakeLists.txt Wed Feb 20 15:08:43 2019 @@ -149,7 +149,7 @@ install(DIRECTORY ../../include/clang-c add_custom_target(libclang-headers) set_target_properties(libclang-headers PROPERTIES FOLDER "Misc") -if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's. +if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-libclang-headers COMPONENT libclang-headers) endif() @@ -165,7 +165,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BIN DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") endforeach() -if(NOT CMAKE_CONFIGURATION_TYPES) +if(NOT LLVM_ENABLE_IDE) add_custom_target(libclang-python-bindings) add_llvm_install_targets(install-libclang-python-bindings COMPONENT _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits