Skip to content

Commit febafce

Browse files
authored
ci: build_Ptex.bash should build Ptex using C++17 (#4978)
If we don't specify anything, it seems that Ptex will think it's using C++98, which it is in fact not capable of doing. Meanwhile, since OIIO's own minimum requirement is C++17, it certainly meand that any compiler we're using can support 17 as a minimum when building Ptex as well. Signed-off-by: Larry Gritz <[email protected]>
1 parent afb365c commit febafce

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ jobs:
463463
LIBRAW_VERSION=0.21.4
464464
LIBTIFF_VERSION=v4.7.1
465465
OPENJPEG_VERSION=v2.5.4
466-
PTEX_VERSION=v2.4.3
466+
PTEX_VERSION=v2.5.0
467467
PUGIXML_VERSION=v1.15
468468
WEBP_VERSION=v1.6.0
469469
FREETYPE_VERSION=VER-2-14-0

INSTALL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
7171
* If you want support for WebP images:
7272
* WebP >= 1.1 (tested through 1.6)
7373
* If you want support for Ptex:
74-
* Ptex >= 2.3.1 (probably works for older; tested through 2.4.3)
74+
* Ptex >= 2.3.1 (probably works for older; tested through 2.5)
7575
* If you want to be able to do font rendering into images:
7676
* Freetype >= 2.10.0 (tested through 2.14)
7777
* If you want to be able to read "ultra-HDR" embedded in JPEG files:

src/build-scripts/build_Ptex.bash

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ git checkout ${PTEX_VERSION} --force
3333

3434
time cmake -S . -B ${PTEX_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release \
3535
-DCMAKE_INSTALL_PREFIX=${PTEX_INSTALL_DIR} \
36+
-DCMAKE_CXX_STANDARD=17 \
3637
${PTEX_CONFIG_OPTS}
3738
time cmake --build ${PTEX_BUILD_DIR} --config Release --target install
3839

0 commit comments

Comments
 (0)