diff options
| -rw-r--r-- | ports/glslang/CONTROL | 5 | ||||
| -rw-r--r-- | ports/glslang/portfile.cmake | 18 | ||||
| -rw-r--r-- | ports/glslang/vcpkg.json | 7 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/g-/glslang.json | 5 |
5 files changed, 28 insertions, 9 deletions
diff --git a/ports/glslang/CONTROL b/ports/glslang/CONTROL deleted file mode 100644 index f0b38f4d2..000000000 --- a/ports/glslang/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: glslang -Version: 2019-03-05 -Port-Version: 2 -Homepage: https://github.com/KhronosGroup/glslang -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 2d5303910..da955a888 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -11,12 +11,20 @@ vcpkg_from_github( CMakeLists-windows.patch ) +if(VCPKG_TARGET_IS_IOS) + # this case will report error since all executable will require BUNDLE DESTINATION + set(BUILD_BINARIES OFF) +else() + set(BUILD_BINARIES ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DCMAKE_DEBUG_POSTFIX=d -DSKIP_GLSLANG_INSTALL=OFF + -DENABLE_GLSLANG_BINARIES=${BUILD_BINARIES} ) vcpkg_install_cmake() @@ -25,9 +33,13 @@ 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") +if(NOT BUILD_BINARIES) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) +else() + file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools) +endif() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/bin) # Handle copyright file(COPY ${CMAKE_CURRENT_LIST_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/glslang) diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json new file mode 100644 index 000000000..24579e689 --- /dev/null +++ b/ports/glslang/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "glslang", + "version-string": "2019-03-05", + "port-version": 3, + "description": "Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator", + "homepage": "https://github.com/KhronosGroup/glslang" +} diff --git a/versions/baseline.json b/versions/baseline.json index 320a976b3..10ebfe286 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2222,7 +2222,7 @@ }, "glslang": { "baseline": "2019-03-05", - "port-version": 2 + "port-version": 3 }, "glui": { "baseline": "2019-11-30", diff --git a/versions/g-/glslang.json b/versions/g-/glslang.json index b9dfb0d7b..1f1a95eaa 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "a7d9b6a3d936d273c6b1966eb3b8fe8cb1ba28d1", + "version-string": "2019-03-05", + "port-version": 3 + }, + { "git-tree": "29f2d736c8273c412c4fcf0fd50da379d1ec9a0b", "version-string": "2019-03-05", "port-version": 2 |