aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjasjuang <jasjuang@gmail.com>2017-11-16 22:34:25 -0800
committerjasjuang <jasjuang@gmail.com>2017-11-16 22:34:25 -0800
commit5236fa3cc7635ea3f828b792ec38191299338d0a (patch)
tree770bcf266c94a27530edbbb54bc5ee76bf442865
parent468e9e70e644eb26258434c9e27e34935eb3e06d (diff)
downloadvcpkg-5236fa3cc7635ea3f828b792ec38191299338d0a.tar.gz
vcpkg-5236fa3cc7635ea3f828b792ec38191299338d0a.zip
add in clang and enable tools
-rw-r--r--ports/llvm/CONTROL2
-rw-r--r--ports/llvm/portfile.cmake32
2 files changed, 32 insertions, 2 deletions
diff --git a/ports/llvm/CONTROL b/ports/llvm/CONTROL
index 2ea653a12..fb8b1b3da 100644
--- a/ports/llvm/CONTROL
+++ b/ports/llvm/CONTROL
@@ -1,3 +1,3 @@
Source: llvm
-Version: 5.0.0-2
+Version: 5.0.0-3
Description: The LLVM Compiler Infrastructure
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
index a2f32abe9..c4233af37 100644
--- a/ports/llvm/portfile.cmake
+++ b/ports/llvm/portfile.cmake
@@ -11,6 +11,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
@@ -25,7 +36,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
@@ -35,6 +46,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)
@@ -42,6 +65,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