diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-12-21 10:55:05 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-12-21 10:55:05 -0800 |
| commit | bf1045db7057f7aec614b5c8be3b729e6c5339fc (patch) | |
| tree | d3e8bb6e6a06c14e31d34ec7e287c834a87a794c | |
| parent | 15ca078f607da82b16e59c1ea534b483207a08f6 (diff) | |
| parent | 5236fa3cc7635ea3f828b792ec38191299338d0a (diff) | |
| download | vcpkg-bf1045db7057f7aec614b5c8be3b729e6c5339fc.tar.gz vcpkg-bf1045db7057f7aec614b5c8be3b729e6c5339fc.zip | |
Merge branch 'llvm' of https://github.com/jasjuang/vcpkg into jasjuang-llvm
| -rw-r--r-- | ports/llvm/CONTROL | 2 | ||||
| -rw-r--r-- | ports/llvm/portfile.cmake | 32 |
2 files changed, 32 insertions, 2 deletions
diff --git a/ports/llvm/CONTROL b/ports/llvm/CONTROL index c50dc8cb8..f043598a9 100644 --- a/ports/llvm/CONTROL +++ b/ports/llvm/CONTROL @@ -1,4 +1,4 @@ Source: llvm -Version: 5.0.0-2 +Version: 5.0.0-3 Description: The LLVM Compiler Infrastructure Build-Depends: atlmfc diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index d2a82cf0b..f9ddef26e 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -15,6 +15,17 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_download_distfile(CLANG_ARCHIVE + URLS "http://releases.llvm.org/5.0.0/cfe-5.0.0.src.tar.xz" + FILENAME "cfe-5.0.0.src.tar.xz" + SHA512 14acdd622310122b544c952ee5b932b7006d9d8424319f0e3974f2503d40a0cec4200fdd3d813a32ce0d877bcfbb9a5bd5c36f6142b4330e6c814f113ca2efe8 +) +vcpkg_extract_source_archive(${CLANG_ARCHIVE} ${SOURCE_PATH}/tools) + +if(NOT EXISTS ${SOURCE_PATH}/tools/clang) + file(RENAME ${SOURCE_PATH}/tools/cfe-5.0.0.src ${SOURCE_PATH}/tools/clang) +endif() + vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/install-cmake-modules-to-share.patch @@ -29,7 +40,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DLLVM_TARGETS_TO_BUILD=X86 - -DLLVM_INCLUDE_TOOLS=OFF + -DLLVM_INCLUDE_TOOLS=ON -DLLVM_INCLUDE_UTILS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF @@ -39,6 +50,18 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*) +file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*) +file(COPY ${EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) +file(COPY ${DEBUG_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools) +file(REMOVE ${EXE}) +file(REMOVE ${DEBUG_EXE}) + +file(GLOB CMAKECONFIG_DEBUG ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/clang/*) +file(GLOB CMAKECONFIG ${CURRENT_PACKAGES_DIR}/lib/cmake/clang/*) +file(COPY ${CMAKECONFIG_DEBUG} DESTINATION ${CURRENT_PACKAGES_DIR}/share/clang) +file(COPY ${CMAKECONFIG} DESTINATION ${CURRENT_PACKAGES_DIR}/share/clang) + vcpkg_fixup_cmake_targets(CONFIG_PATH share/llvm) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/llvm) @@ -46,6 +69,13 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/tools ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/debug/bin + ${CURRENT_PACKAGES_DIR}/debug/lib/cmake + ${CURRENT_PACKAGES_DIR}/debug/msbuild-bin + ${CURRENT_PACKAGES_DIR}/bin + ${CURRENT_PACKAGES_DIR}/lib/cmake + ${CURRENT_PACKAGES_DIR}/msbuild-bin + ${CURRENT_PACKAGES_DIR}/tools/msbuild-bin ) # Remove one empty include subdirectory if it is indeed empty |