aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2020-10-20 21:05:09 -0700
committerGitHub <noreply@github.com>2020-10-20 21:05:09 -0700
commit998f86a82946591b1e80ade99a52699967dc66af (patch)
tree234079a34d9dd5373460717c653275ae69837b20
parent6299de85675d2c3995be357d17467aa650a141be (diff)
downloadvcpkg-998f86a82946591b1e80ade99a52699967dc66af.tar.gz
vcpkg-998f86a82946591b1e80ade99a52699967dc66af.zip
[ptex] Fix build on *inx (#14142)
-rw-r--r--ports/ptex/CONTROL3
-rw-r--r--ports/ptex/portfile.cmake4
-rw-r--r--scripts/ci.baseline.txt4
3 files changed, 4 insertions, 7 deletions
diff --git a/ports/ptex/CONTROL b/ports/ptex/CONTROL
index 501913cf5..c00a1a0b8 100644
--- a/ports/ptex/CONTROL
+++ b/ports/ptex/CONTROL
@@ -1,5 +1,6 @@
Source: ptex
-Version: 2.3.2-1
+Version: 2.3.2
+Port-Version: 2
Homepage: https://github.com/wdas/ptex
Description: Per-Face Texture Mapping for Production Rendering.
Build-Depends: zlib
diff --git a/ports/ptex/portfile.cmake b/ports/ptex/portfile.cmake
index 933364097..f065e4426 100644
--- a/ports/ptex/portfile.cmake
+++ b/ports/ptex/portfile.cmake
@@ -25,7 +25,7 @@ vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
- -DPTEX_VER="v${PTEX_VER}"
+ -DPTEX_VER=v${PTEX_VER}
-DPTEX_BUILD_SHARED_LIBS=${BUILD_SHARED_LIB}
-DPTEX_BUILD_STATIC_LIBS=${BUILD_STATIC_LIB}
)
@@ -46,4 +46,4 @@ endforeach()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
# Handle copyright
-file(INSTALL ${SOURCE_PATH}/src/doc/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/src/doc/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 80950fa9d..8f1a01495 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1320,10 +1320,6 @@ protobuf-c:arm-uwp=fail
# proxygen fails with "Target 'Windows' not supported by proxygen!"
proxygen:x64-windows=fail
proxygen:x64-windows-static=fail
-ptex:arm-uwp=fail
-ptex:x64-linux=fail
-ptex:x64-osx=fail
-ptex:x64-uwp=fail
pthreads:arm64-windows=fail
pthreads:arm-uwp=fail
pthreads:x64-uwp=fail