diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-01-09 08:33:48 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2020-01-08 16:33:48 -0800 |
| commit | f2c10569022387becf694f16e20068a67fd6c3e0 (patch) | |
| tree | 656901cd7ea932383ee6de460f048deb68e67107 /ports/forge | |
| parent | 8101b5adaf0cf68ef6af8214bc1e1876b1bc5237 (diff) | |
| download | vcpkg-f2c10569022387becf694f16e20068a67fd6c3e0.tar.gz vcpkg-f2c10569022387becf694f16e20068a67fd6c3e0.zip | |
Update baseline (#9579)
Diffstat (limited to 'ports/forge')
| -rw-r--r-- | ports/forge/CONTROL | 2 | ||||
| -rw-r--r-- | ports/forge/portfile.cmake | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/ports/forge/CONTROL b/ports/forge/CONTROL index 595f6d2a2..d791f8ad6 100644 --- a/ports/forge/CONTROL +++ b/ports/forge/CONTROL @@ -1,4 +1,4 @@ Source: forge
-Version: 1.0.4-1 +Version: 1.0.4-2 Description: Helps with high performance visualizations involving OpenGL-CUDA/OpenCL interop.
Build-Depends: glfw3, glm, glbinding, freetype, boost-functional, freeimage, fontconfig (!windows)
diff --git a/ports/forge/portfile.cmake b/ports/forge/portfile.cmake index 24df90dce..05c099c5a 100644 --- a/ports/forge/portfile.cmake +++ b/ports/forge/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
message(FATAL_ERROR "This port currently only supports x64 architecture")
endif()
@@ -25,15 +23,20 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+if (VCPKG_TARGET_IS_WINDOWS)
+ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+else()
+ vcpkg_fixup_cmake_targets(CONFIG_PATH share/Forge/cmake)
+endif()
file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/bin/* ${CURRENT_PACKAGES_DIR}/debug/bin/*)
list(FILTER DLLS EXCLUDE REGEX "forge\\.dll\$")
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
+ ${CURRENT_PACKAGES_DIR}/debug/share
${CURRENT_PACKAGES_DIR}/debug/examples
${CURRENT_PACKAGES_DIR}/examples
${DLLS}
)
-file(INSTALL ${SOURCE_PATH}/.github/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/forge RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/.github/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|