diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-03-18 14:29:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-18 14:29:07 -0700 |
| commit | 769ec61adde67306f73aa691d50d3d5e66fb99ae (patch) | |
| tree | 0971c3b465566c950027f884e862e6be72632f72 | |
| parent | aed7d2e2146b26edc9943d650f391ef2407e5a54 (diff) | |
| parent | 164c78cab81b6a9b54b2e507183486419d170e5d (diff) | |
| download | vcpkg-769ec61adde67306f73aa691d50d3d5e66fb99ae.tar.gz vcpkg-769ec61adde67306f73aa691d50d3d5e66fb99ae.zip | |
Merge pull request #5699 from cwfitzgerald/glslang-fixup
[glslang] Properly fixup cmake targets
| -rw-r--r-- | ports/glslang/CONTROL | 2 | ||||
| -rw-r--r-- | ports/glslang/portfile.cmake | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ports/glslang/CONTROL b/ports/glslang/CONTROL index c92482843..8f6bb6de9 100644 --- a/ports/glslang/CONTROL +++ b/ports/glslang/CONTROL @@ -1,3 +1,3 @@ Source: glslang -Version: 2018-03-02-1 +Version: 2018-03-02-2 Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index f2ec0e3cd..77e15052d 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -20,8 +20,10 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_fixup_cmake_targets() + 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") |