[ptex] update to 2.4.3 (#41615)

This commit is contained in:
Jia Yue Hua 2024-10-19 07:49:45 +08:00 committed by GitHub
parent 7d62e41f58
commit b046d77750
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 24 additions and 9 deletions

View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f8c3af..d4d4425 100644
index 78f6531..b7ea30b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,9 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
@@ -28,7 +28,9 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
include(GNUInstallDirs)
include(CTest)
@ -12,15 +12,17 @@ index 2f8c3af..d4d4425 100644
# Setup platform-specific threading flags.
find_package(Threads REQUIRED)
@@ -112,7 +114,9 @@ endif ()
@@ -113,9 +115,11 @@ endif ()
include_directories(src/ptex)
add_subdirectory(src/ptex)
+if(0)
add_subdirectory(src/utils)
add_subdirectory(src/tests)
add_subdirectory(src/doc)
+endif()
if (PTEX_BUILD_DOCS)
add_subdirectory(src/doc)
endif ()
+endif ()
add_subdirectory(src/build)
diff --git a/src/ptex/CMakeLists.txt b/src/ptex/CMakeLists.txt
index 4dfe372..4572dd5 100644

View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO wdas/ptex
REF "v${VERSION}"
SHA512 3b9607b7803e7c857bb00a6d4d8bbe108810c622a3593fb5d655183f3e6689f274ee5e79bcaab6928de38daf05cf25eb56125f39477f134131a8ad45071551b3
SHA512 34fcaf1c4fe27cb4e66d66bb729137ef17ffeea2bc2d849f2f5f543b19acc250f425633142320ce797c2a086e04bc3e0870c94928ad45d94e34faee71af36890
HEAD_REF master
PATCHES
fix-build.patch
@ -21,7 +21,15 @@ vcpkg_cmake_configure(
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/Ptex)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Ptex )
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/ptex.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ptex.pc")
file(COPY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ptex.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/")
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig")
vcpkg_copy_pdbs()
foreach(HEADER PtexHalf.h Ptexture.h)

View File

@ -1,6 +1,6 @@
{
"name": "ptex",
"version": "2.4.2",
"version": "2.4.3",
"description": "Per-Face Texture Mapping for Production Rendering.",
"homepage": "https://github.com/wdas/ptex",
"license": "BSD-3-Clause",

View File

@ -7197,7 +7197,7 @@
"port-version": 1
},
"ptex": {
"baseline": "2.4.2",
"baseline": "2.4.3",
"port-version": 0
},
"pthread": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8a98c639f2e68c4638eee485c6398a81ab52e3f1",
"version": "2.4.3",
"port-version": 0
},
{
"git-tree": "64ba10b1e0174e06bcb2821e395d411641d1611e",
"version": "2.4.2",