diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-03-26 11:43:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-25 20:43:02 -0700 |
| commit | d98696de851170a5ac24da346b2656023f8db370 (patch) | |
| tree | 6d7fd7be49dc48173fd1725c0dbd696c95a213a6 /ports/llvm | |
| parent | 42ad12f91d62a6533d909d8b5ee3a46009c2a10a (diff) | |
| download | vcpkg-d98696de851170a5ac24da346b2656023f8db370.tar.gz vcpkg-d98696de851170a5ac24da346b2656023f8db370.zip | |
[vcpkg baseline] Fix CI test (#10508)
* re-trigger ci test
* [kealib] Switch repo to github
* [mongo-c-driver] Set icu as a feature
* [monkeys-audio] Update version to 5.24
* [mongo-c-driver] Fix arm build
* [mongo-c-driver] Re-generate patch
* [mongo-c-driver] Remove key word PRIVATE in patch
* [llvm] Remove default feature tools
* [llvm] Add judgment to install tools
* [llvm] Add more condition
* [llvm] Fix clang cmake files when selecting feature tools
* [halide] Fix build depends info in CONTROL
* update baseline
Diffstat (limited to 'ports/llvm')
| -rw-r--r-- | ports/llvm/CONTROL | 4 | ||||
| -rw-r--r-- | ports/llvm/portfile.cmake | 29 |
2 files changed, 20 insertions, 13 deletions
diff --git a/ports/llvm/CONTROL b/ports/llvm/CONTROL index 2d30612b0..64b4aebd4 100644 --- a/ports/llvm/CONTROL +++ b/ports/llvm/CONTROL @@ -1,10 +1,10 @@ Source: llvm -Version: 8.0.0-4 +Version: 8.0.0-5 Homepage: https://llvm.org/ Description: The LLVM Compiler Infrastructure Build-Depends: atlmfc (windows) Supports: !uwp -Default-Features: tools, utils +Default-Features: utils Feature: tools Description: Generate build targets for the LLVM tools. diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index d8613f728..85ffb48e4 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -63,37 +63,44 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") +if((NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") AND "tools" IN_LIST FEATURES) file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*) file(COPY ${EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/llvm) file(REMOVE ${EXE}) endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") +if((NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") AND "tools" IN_LIST FEATURES) file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*) file(COPY ${DEBUG_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/llvm) file(REMOVE ${DEBUG_EXE}) endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/clang TARGET_PATH share/clang) +if ("tools" IN_LIST FEATURES) + vcpkg_fixup_cmake_targets(CONFIG_PATH share/clang TARGET_PATH share/clang) + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(READ ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-release.cmake RELEASE_MODULE) + string(REPLACE "\${_IMPORT_PREFIX}/bin" "\${_IMPORT_PREFIX}/tools/llvm" RELEASE_MODULE "${RELEASE_MODULE}") + file(WRITE ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-release.cmake "${RELEASE_MODULE}") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(READ ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-debug.cmake DEBUG_MODULE) + string(REPLACE "\${_IMPORT_PREFIX}/debug/bin" "\${_IMPORT_PREFIX}/tools/llvm" DEBUG_MODULE "${DEBUG_MODULE}") + file(WRITE ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-debug.cmake "${DEBUG_MODULE}") + endif() +endif() + vcpkg_fixup_cmake_targets(CONFIG_PATH share/llvm) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/llvm) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(READ ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-release.cmake RELEASE_MODULE) - string(REPLACE "\${_IMPORT_PREFIX}/bin" "\${_IMPORT_PREFIX}/tools/llvm" RELEASE_MODULE "${RELEASE_MODULE}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-release.cmake "${RELEASE_MODULE}") - file(READ ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-release.cmake RELEASE_MODULE) string(REPLACE "\${_IMPORT_PREFIX}/bin" "\${_IMPORT_PREFIX}/tools/llvm" RELEASE_MODULE "${RELEASE_MODULE}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-release.cmake "${RELEASE_MODULE}") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(READ ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-debug.cmake DEBUG_MODULE) - string(REPLACE "\${_IMPORT_PREFIX}/debug/bin" "\${_IMPORT_PREFIX}/tools/llvm" DEBUG_MODULE "${DEBUG_MODULE}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-debug.cmake "${DEBUG_MODULE}") - file(READ ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-debug.cmake DEBUG_MODULE) string(REPLACE "\${_IMPORT_PREFIX}/debug/bin" "\${_IMPORT_PREFIX}/tools/llvm" DEBUG_MODULE "${DEBUG_MODULE}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-debug.cmake "${DEBUG_MODULE}") |
