mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-29 05:50:52 +08:00
cfc05991f5
* [llvm] Update to version 10.0.0 and new features * switch to llvmorg-10.0.0-rc3, allow to use bin directory for tools * Fix CMake targets after vcpkg_fixup_cmake_targets call. * [halide] Update to master version to support LLVM 10 * [halide] fix x64-osx build * [llvm] add enable-assertions feature * [llvm] fix comment * [llvm] enable ci for x64-linux and x64-osx * [llvm] update to v10.0.0-rc5 [llvm] disable assertions and ABI breaking checks by default [llvm] limit the maximum number of concurrent link jobs to 1 [llvm] add postfix `d` and debug shared libraries in the `/bin` directory * [llvm] revert debug postfix `d` [llvm] don't remove debug version of tools and shared libs * [llvm] fix debug tools path * [llvm] update to release tag llvmorg-10.0.0 [llvm] build with CMAKE_DEBUG_POSTFIX=d [llvm] remove debug binaries * remove new CMake argument FOLLOW_SYMLINK_CHAIN * [llvm] force TableGen to be built with optimization * [llvm] add future disable-clang-static-analyzer * [llvm] add futures for main targets [llvm] remove utils and clang-tools-extra from default features list [llvm] exclude tests * [llvm] add features for main targets [llvm] remove utils and clang-tools-extra from default features list [llvm] exclude tests * [llvm] update features description Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
|
|
index a02c2a5a23f..bdbf0b1303c 100644
|
|
--- a/llvm/CMakeLists.txt
|
|
+++ b/llvm/CMakeLists.txt
|
|
@@ -70,6 +70,12 @@ if( LLVM_ENABLE_PROJECTS STREQUAL "all" )
|
|
set( LLVM_ENABLE_PROJECTS ${LLVM_ALL_PROJECTS})
|
|
endif()
|
|
|
|
+# Allow to use commas in LLVM_ENABLE_PROJECTS ("llvm,clang,...")
|
|
+string(REPLACE "," ";" fixed_LLVM_ENABLE_PROJECTS "${LLVM_ENABLE_PROJECTS}")
|
|
+if(NOT fixed_LLVM_ENABLE_PROJECTS STREQUAL LLVM_ENABLE_PROJECTS)
|
|
+ set(LLVM_ENABLE_PROJECTS "${fixed_LLVM_ENABLE_PROJECTS}" CACHE STRING "" FORCE)
|
|
+endif()
|
|
+
|
|
# LLVM_ENABLE_PROJECTS_USED is `ON` if the user has ever used the
|
|
# `LLVM_ENABLE_PROJECTS` CMake cache variable. This exists for
|
|
# several reasons:
|
|
@@ -383,6 +389,12 @@ set(LLVM_TARGETS_TO_BUILD
|
|
${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD})
|
|
list(REMOVE_DUPLICATES LLVM_TARGETS_TO_BUILD)
|
|
|
|
+# Allow to use commas in the LLVM_TARGETS_TO_BUILD ("X86,AArch64,...")
|
|
+string(REPLACE "," ";" fixed_LLVM_TARGETS_TO_BUILD "${LLVM_TARGETS_TO_BUILD}")
|
|
+if(NOT fixed_LLVM_TARGETS_TO_BUILD STREQUAL LLVM_TARGETS_TO_BUILD)
|
|
+ set(LLVM_TARGETS_TO_BUILD "${fixed_LLVM_TARGETS_TO_BUILD}" CACHE STRING "" FORCE)
|
|
+endif()
|
|
+
|
|
option(LLVM_ENABLE_PIC "Build Position-Independent Code" ON)
|
|
option(LLVM_ENABLE_WARNINGS "Enable compiler warnings." ON)
|
|
option(LLVM_ENABLE_MODULES "Compile with C++ modules enabled." OFF)
|