diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-15 21:15:37 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-11-15 21:15:37 -0800 |
| commit | 4228e1e389f31b70eb7078aed99b21ad465d8aa0 (patch) | |
| tree | 37e762aa055fb65c6766d726e67048cc810eeee5 | |
| parent | 24283ec1ee019df3e43dbb9c9bf2f1d9d1263911 (diff) | |
| download | vcpkg-4228e1e389f31b70eb7078aed99b21ad465d8aa0.tar.gz vcpkg-4228e1e389f31b70eb7078aed99b21ad465d8aa0.zip | |
[llvm] Install debug targets for cmake
| -rw-r--r-- | ports/llvm/CONTROL | 2 | ||||
| -rw-r--r-- | ports/llvm/portfile.cmake | 13 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_fixup_cmake_targets.cmake | 5 |
3 files changed, 14 insertions, 6 deletions
diff --git a/ports/llvm/CONTROL b/ports/llvm/CONTROL index 2f6b1ec93..2ea653a12 100644 --- a/ports/llvm/CONTROL +++ b/ports/llvm/CONTROL @@ -1,3 +1,3 @@ Source: llvm -Version: 5.0.0-1 +Version: 5.0.0-2 Description: The LLVM Compiler Infrastructure diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 55a23f802..a2f32abe9 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -30,14 +30,19 @@ vcpkg_configure_cmake( -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_ABI_BREAKING_CHECKS=FORCE_OFF - -DLLVM_TOOLS_INSTALL_DIR=tools + -DLLVM_TOOLS_INSTALL_DIR=tools/llvm ) vcpkg_install_cmake() -# Remove extra copy of cmake modules and include files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/llvm) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/llvm) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/tools + ${CURRENT_PACKAGES_DIR}/debug/share +) # Remove one empty include subdirectory if it is indeed empty file(GLOB MCANALYSISFILES ${CURRENT_PACKAGES_DIR}/include/llvm/MC/MCAnalysis/*) diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake index 22c2245c8..5bf1b2cdb 100644 --- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake +++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake @@ -81,9 +81,11 @@ function(vcpkg_fixup_cmake_targets) file(REMOVE ${UNUSED_FILES}) endif() + # LLVM uses "LLVMExports-release.cmake" file(GLOB RELEASE_TARGETS "${RELEASE_SHARE}/*[Tt]argets-release.cmake" "${RELEASE_SHARE}/*[Cc]onfig-release.cmake" + "${RELEASE_SHARE}/*[Ee]xports-release.cmake" ) foreach(RELEASE_TARGET ${RELEASE_TARGETS}) file(READ ${RELEASE_TARGET} _contents) @@ -95,7 +97,8 @@ function(vcpkg_fixup_cmake_targets) file(GLOB DEBUG_TARGETS "${DEBUG_SHARE}/*[Tt]argets-debug.cmake" "${DEBUG_SHARE}/*[Cc]onfig-debug.cmake" - ) + "${DEBUG_SHARE}/*[Ee]xports-debug.cmake" + ) foreach(DEBUG_TARGET ${DEBUG_TARGETS}) get_filename_component(DEBUG_TARGET_NAME ${DEBUG_TARGET} NAME) |