diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-09-12 03:54:29 +0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-09-11 12:54:29 -0700 |
| commit | 2b277b4ef6acb5872c5f98136db7cdb6c486cf02 (patch) | |
| tree | e2d070a4bcf6c0c9035438b8582cf930e2e3740d | |
| parent | cb0fc1a5f98f98aa8b86a32c9bce3074e775042e (diff) | |
| download | vcpkg-2b277b4ef6acb5872c5f98136db7cdb6c486cf02.tar.gz vcpkg-2b277b4ef6acb5872c5f98136db7cdb6c486cf02.zip | |
[glslang]Fix generated cmake files. (#8051)
| -rw-r--r-- | ports/glslang/CONTROL | 2 | ||||
| -rw-r--r-- | ports/glslang/portfile.cmake | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ports/glslang/CONTROL b/ports/glslang/CONTROL index 2d16ad41b..06f8f810f 100644 --- a/ports/glslang/CONTROL +++ b/ports/glslang/CONTROL @@ -1,4 +1,4 @@ Source: glslang -Version: 2019-03-05 +Version: 2019-03-05-1 Homepage: https://github.com/KhronosGroup/glslang Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
\ No newline at end of file diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index 003aa26aa..1bb8121b1 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -16,15 +16,20 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DCMAKE_DEBUG_POSTFIX=d -DSKIP_GLSLANG_INSTALL=OFF + OPTIONS + -DCMAKE_DEBUG_POSTFIX=d + -DSKIP_GLSLANG_INSTALL=OFF ) vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/glslang) + +vcpkg_copy_pdbs() + file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright file(COPY ${CMAKE_CURRENT_LIST_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/glslang) |