Skip to content

Commit 59eb2a1

Browse files
pre-commit-ci[bot]pre-commit-ci[bot]
committed
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent bd4d35f commit 59eb2a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1450
-999
lines changed

‎cmake/defaults/CY2023.cmake‎

Lines changed: 128 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,140 @@
1-
# CY2023 VFX Reference Platform versions of dependencies
2-
# see https://vfxplatform.com/
1+
# CY2023 VFX Reference Platform versions of dependencies see https://vfxplatform.com/
32

43
IF(RV_VFX_PLATFORM STREQUAL "CY2023")
5-
# Year
6-
SET(RV_VFX_CY_YEAR "2023")
7-
SET(RV_VFX_CY2023 ON )
8-
ADD_COMPILE_DEFINITIONS(RV_VFX_CY2023)
4+
# Year
5+
SET(RV_VFX_CY_YEAR
6+
"2023"
7+
)
8+
SET(RV_VFX_CY2023
9+
ON
10+
)
11+
ADD_COMPILE_DEFINITIONS(RV_VFX_CY2023)
912

10-
# Boost
11-
SET(RV_DEPS_BOOST_DOWNLOAD_HASH "077f074743ea7b0cb49c6ed43953ae95")
12-
SET(RV_DEPS_BOOST_MAJOR_MINOR_VERSION "1_80")
13-
SET(RV_DEPS_BOOST_VERSION "1.80.0")
13+
# Boost
14+
SET(RV_DEPS_BOOST_DOWNLOAD_HASH
15+
"077f074743ea7b0cb49c6ed43953ae95"
16+
)
17+
SET(RV_DEPS_BOOST_MAJOR_MINOR_VERSION
18+
"1_80"
19+
)
20+
SET(RV_DEPS_BOOST_VERSION
21+
"1.80.0"
22+
)
1423

15-
# Special case for XCode 15 on macOS
16-
if(RV_TARGET_DARWIN)
17-
execute_process(
18-
COMMAND xcrun clang --version
19-
OUTPUT_VARIABLE CLANG_FULL_VERSION_STRING
20-
)
21-
string(
22-
REGEX
23-
REPLACE ".*clang version ([0-9]+\\.[0-9]+).*" "\\1" CLANG_VERSION_STRING ${CLANG_FULL_VERSION_STRING}
24-
)
25-
if(CLANG_VERSION_STRING VERSION_GREATER_EQUAL 15.0)
26-
message(STATUS "Clang version ${CLANG_VERSION_STRING} is not compatible with Boost 1.80, using Boost 1.81 instead. "
27-
"Install XCode 14.3.1 if you absolutely want to use Boost version 1.80 as per VFX reference platform CY2023"
28-
)
29-
SET(RV_DEPS_BOOST_VERSION "1.81.0")
30-
SET(RV_DEPS_BOOST_MAJOR_MINOR_VERSION "1_81")
31-
SET(RV_DEPS_BOOST_DOWNLOAD_HASH "4bf02e84afb56dfdccd1e6aec9911f4b")
32-
endif()
33-
endif()
24+
# Special case for XCode 15 on macOS
25+
IF(RV_TARGET_DARWIN)
26+
EXECUTE_PROCESS(
27+
COMMAND xcrun clang --version
28+
OUTPUT_VARIABLE CLANG_FULL_VERSION_STRING
29+
)
30+
STRING(
31+
REGEX
32+
REPLACE ".*clang version ([0-9]+\\.[0-9]+).*" "\\1" CLANG_VERSION_STRING ${CLANG_FULL_VERSION_STRING}
33+
)
34+
IF(CLANG_VERSION_STRING VERSION_GREATER_EQUAL 15.0)
35+
MESSAGE(STATUS "Clang version ${CLANG_VERSION_STRING} is not compatible with Boost 1.80, using Boost 1.81 instead. "
36+
"Install XCode 14.3.1 if you absolutely want to use Boost version 1.80 as per VFX reference platform CY2023"
37+
)
38+
SET(RV_DEPS_BOOST_VERSION
39+
"1.81.0"
40+
)
41+
SET(RV_DEPS_BOOST_MAJOR_MINOR_VERSION
42+
"1_81"
43+
)
44+
SET(RV_DEPS_BOOST_DOWNLOAD_HASH
45+
"4bf02e84afb56dfdccd1e6aec9911f4b"
46+
)
47+
ENDIF()
48+
ENDIF()
3449

35-
# Imath
36-
# Can find the build version in OpenRV/_build/RV_DEPS_IMATH/install/lib/
37-
SET(RV_DEPS_IMATH_VERSION "3.1.12")
38-
SET(RV_DEPS_IMATH_DOWNLOAD_HASH "d4059140972da68a2b5a1287ebe5a653")
39-
SET(RV_DEPS_IMATH_LIB_VER "29.11.0")
40-
SET(RV_DEPS_IMATH_LIB_MAJOR "3_1")
50+
# Imath Can find the build version in OpenRV/_build/RV_DEPS_IMATH/install/lib/
51+
SET(RV_DEPS_IMATH_VERSION
52+
"3.1.12"
53+
)
54+
SET(RV_DEPS_IMATH_DOWNLOAD_HASH
55+
"d4059140972da68a2b5a1287ebe5a653"
56+
)
57+
SET(RV_DEPS_IMATH_LIB_VER
58+
"29.11.0"
59+
)
60+
SET(RV_DEPS_IMATH_LIB_MAJOR
61+
"3_1"
62+
)
4163

42-
# NumPy
43-
# NumPY for CY2023 is 1.23.x series but Pyside2 requires < 1.23
44-
# So we comment this out and make_pyside.py hardcoded to use NumPy < 1.23
45-
#SET(ENV{RV_DEPS_NUMPY_VERSION} "1.23.5")
64+
# NumPy NumPY for CY2023 is 1.23.x series but Pyside2 requires < 1.23 So we comment this out and make_pyside.py hardcoded to use NumPy < 1.23
65+
# SET(ENV{RV_DEPS_NUMPY_VERSION} "1.23.5")
4666

47-
# OCIO
48-
# https://github.com/AcademySoftwareFoundation/OpenColorIO
49-
SET(RV_DEPS_OCIO_VERSION "2.2.1")
50-
SET(RV_DEPS_OCIO_VERSION_SHORT "2_2")
51-
SET(RV_DEPS_OCIO_DOWNLOAD_HASH "d337d7cc890c6a04ad725556c2b7fb4c")
67+
# OCIO https://github.com/AcademySoftwareFoundation/OpenColorIO
68+
SET(RV_DEPS_OCIO_VERSION
69+
"2.2.1"
70+
)
71+
SET(RV_DEPS_OCIO_VERSION_SHORT
72+
"2_2"
73+
)
74+
SET(RV_DEPS_OCIO_DOWNLOAD_HASH
75+
"d337d7cc890c6a04ad725556c2b7fb4c"
76+
)
5277

53-
# OpenEXR
54-
# https://github.com/AcademySoftwareFoundation/openexr/releases
55-
SET(RV_DEPS_OPENEXR_VERSION "3.1.13")
56-
SET(RV_DEPS_OPENEXR_DOWNLOAD_HASH "bbb385d52695502ea47303a2810a8bc1")
57-
SET(RV_DEPS_OPENEXR_LIBNAME_SUFFIX "3_1")
58-
SET(RV_DEPS_OPENEXR_LIB_VERSION_SUFFIX "30.13.1")
59-
SET(RV_DEPS_OPENEXR_PATCH_NAME "openexr_${RV_DEPS_OPENEXR_VERSION}_invalid_to_black")
78+
# OpenEXR https://github.com/AcademySoftwareFoundation/openexr/releases
79+
SET(RV_DEPS_OPENEXR_VERSION
80+
"3.1.13"
81+
)
82+
SET(RV_DEPS_OPENEXR_DOWNLOAD_HASH
83+
"bbb385d52695502ea47303a2810a8bc1"
84+
)
85+
SET(RV_DEPS_OPENEXR_LIBNAME_SUFFIX
86+
"3_1"
87+
)
88+
SET(RV_DEPS_OPENEXR_LIB_VERSION_SUFFIX
89+
"30.13.1"
90+
)
91+
SET(RV_DEPS_OPENEXR_PATCH_NAME
92+
"openexr_${RV_DEPS_OPENEXR_VERSION}_invalid_to_black"
93+
)
6094

61-
# OpenSSL
62-
# https://github.com/openssl/openssl
63-
SET(RV_DEPS_OPENSSL_HASH "72f7ba7395f0f0652783ba1089aa0dcc")
64-
SET(RV_DEPS_OPENSSL_VERSION "1.1.1u")
65-
SET(RV_DEPS_OPENSSL_VERSION_DOT ".1.1")
66-
SET(RV_DEPS_OPENSSL_VERSION_UNDERSCORE "1_1")
95+
# OpenSSL https://github.com/openssl/openssl
96+
SET(RV_DEPS_OPENSSL_HASH
97+
"72f7ba7395f0f0652783ba1089aa0dcc"
98+
)
99+
SET(RV_DEPS_OPENSSL_VERSION
100+
"1.1.1u"
101+
)
102+
SET(RV_DEPS_OPENSSL_VERSION_DOT
103+
".1.1"
104+
)
105+
SET(RV_DEPS_OPENSSL_VERSION_UNDERSCORE
106+
"1_1"
107+
)
67108

68-
# PySide
69-
SET(RV_DEPS_PYSIDE_TARGET "RV_DEPS_PYSIDE2")
70-
SET(RV_DEPS_PYSIDE_VERSION "5.15.10")
71-
SET(RV_DEPS_PYSIDE_DOWNLOAD_HASH "87841aaced763b6b52e9b549e31a493f")
72-
# SET(RV_DEPS_PYSIDE_VERSION "5.15.18")
73-
# SET(RV_DEPS_PYSIDE_DOWNLOAD_HASH "52aa32613f7a69ff46e38ed8a427eb38")
74-
SET(RV_DEPS_PYSIDE_ARCHIVE_URL "https://mirrors.ocf.berkeley.edu/qt/official_releases/QtForPython/pyside2/PySide2-${RV_DEPS_PYSIDE_VERSION}-src/pyside-setup-opensource-src-${RV_DEPS_PYSIDE_VERSION}.zip")
109+
# PySide
110+
SET(RV_DEPS_PYSIDE_TARGET
111+
"RV_DEPS_PYSIDE2"
112+
)
113+
SET(RV_DEPS_PYSIDE_VERSION
114+
"5.15.10"
115+
)
116+
SET(RV_DEPS_PYSIDE_DOWNLOAD_HASH
117+
"87841aaced763b6b52e9b549e31a493f"
118+
)
119+
# SET(RV_DEPS_PYSIDE_VERSION "5.15.18") SET(RV_DEPS_PYSIDE_DOWNLOAD_HASH "52aa32613f7a69ff46e38ed8a427eb38")
120+
SET(RV_DEPS_PYSIDE_ARCHIVE_URL
121+
"https://mirrors.ocf.berkeley.edu/qt/official_releases/QtForPython/pyside2/PySide2-${RV_DEPS_PYSIDE_VERSION}-src/pyside-setup-opensource-src-${RV_DEPS_PYSIDE_VERSION}.zip"
122+
)
75123

76-
# Python
77-
# https://www.python.org/downloads/source/
78-
SET(RV_DEPS_PYTHON_VERSION "3.10.13")
79-
SET(RV_DEPS_PYTHON_DOWNLOAD_HASH "21b32503f31386b37f0c42172dfe5637")
80-
# SET(RV_DEPS_PYTHON_VERSION "3.10.18")
81-
# SET(RV_DEPS_PYTHON_DOWNLOAD_HASH "e381359208e2bd0485169656b50ff24c")
124+
# Python https://www.python.org/downloads/source/
125+
SET(RV_DEPS_PYTHON_VERSION
126+
"3.10.13"
127+
)
128+
SET(RV_DEPS_PYTHON_DOWNLOAD_HASH
129+
"21b32503f31386b37f0c42172dfe5637"
130+
)
131+
# SET(RV_DEPS_PYTHON_VERSION "3.10.18") SET(RV_DEPS_PYTHON_DOWNLOAD_HASH "e381359208e2bd0485169656b50ff24c")
82132

83-
# Qt
84-
SET(RV_DEPS_QT_VERSION "5.15.10")
85-
SET(RV_DEPS_QT_MAJOR "5")
86-
ENDIF()
133+
# Qt
134+
SET(RV_DEPS_QT_VERSION
135+
"5.15.10"
136+
)
137+
SET(RV_DEPS_QT_MAJOR
138+
"5"
139+
)
140+
ENDIF()

‎cmake/defaults/CY2024.cmake‎

Lines changed: 113 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,115 @@
1-
# CY2024 VFX Reference Platform versions of dependencies
2-
# see https://vfxplatform.com/
1+
# CY2024 VFX Reference Platform versions of dependencies see https://vfxplatform.com/
32

43
IF(RV_VFX_PLATFORM STREQUAL "CY2024")
5-
# Year
6-
SET(RV_VFX_CY_YEAR "2024")
7-
SET(RV_VFX_CY2024 ON )
8-
ADD_COMPILE_DEFINITIONS(QT65ON)
9-
10-
# Boost
11-
SET(RV_DEPS_BOOST_VERSION "1.82.0")
12-
SET(RV_DEPS_BOOST_MAJOR_MINOR_VERSION "1_82")
13-
SET(RV_DEPS_BOOST_DOWNLOAD_HASH "f7050f554a65f6a42ece221eaeec1660")
14-
15-
# Imath
16-
# Can find the build version in OpenRV/_build/RV_DEPS_IMATH/install/lib/
17-
SET(RV_DEPS_IMATH_VERSION "3.1.12")
18-
SET(RV_DEPS_IMATH_DOWNLOAD_HASH "d4059140972da68a2b5a1287ebe5a653")
19-
SET(RV_DEPS_IMATH_LIB_VER "29.11.0")
20-
SET(RV_DEPS_IMATH_LIB_MAJOR "3_1")
21-
22-
# NumPy
23-
# https://numpy.org/doc/stable/release.html
24-
SET(ENV{RV_DEPS_NUMPY_VERSION} "1.24.4")
25-
26-
# OCIO
27-
# https://github.com/AcademySoftwareFoundation/OpenColorIO
28-
SET(RV_DEPS_OCIO_VERSION "2.3.2")
29-
SET(RV_DEPS_OCIO_VERSION_SHORT "2_3")
30-
SET(RV_DEPS_OCIO_DOWNLOAD_HASH "9eb7834a7cc66b14f0251b7673be0d81")
31-
32-
# OpenEXR
33-
# https://github.com/AcademySoftwareFoundation/openexr/releases
34-
SET(RV_DEPS_OPENEXR_VERSION "3.2.5")
35-
SET(RV_DEPS_OPENEXR_DOWNLOAD_HASH "838dfec3bb2a60fee02cc4f0378b6a5c")
36-
SET(RV_DEPS_OPENEXR_LIBNAME_SUFFIX "3_2")
37-
SET(RV_DEPS_OPENEXR_LIB_VERSION_SUFFIX "31.${RV_DEPS_OPENEXR_VERSION}")
38-
SET(RV_DEPS_OPENEXR_PATCH_NAME "openexr_${RV_DEPS_OPENEXR_VERSION}_invalid_to_black")
39-
40-
# OpenSSL
41-
# https://github.com/openssl/openssl
42-
SET(RV_DEPS_OPENSSL_VERSION "3.4.0")
43-
SET(RV_DEPS_OPENSSL_HASH "34733f7be2d60ecd8bd9ddb796e182af")
44-
SET(RV_DEPS_OPENSSL_VERSION_DOT ".3")
45-
SET(RV_DEPS_OPENSSL_VERSION_UNDERSCORE "3")
46-
47-
# PySide
48-
SET(RV_DEPS_PYSIDE_VERSION "6.5.3")
49-
SET(RV_DEPS_PYSIDE_DOWNLOAD_HASH "515d3249c6e743219ff0d7dd25b8c8d8")
50-
SET(RV_DEPS_PYSIDE_TARGET "RV_DEPS_PYSIDE6")
51-
SET(RV_DEPS_PYSIDE_ARCHIVE_URL "https://mirrors.ocf.berkeley.edu/qt/official_releases/QtForPython/pyside6/PySide6-${RV_DEPS_PYSIDE_VERSION}-src/pyside-setup-everywhere-src-${RV_DEPS_PYSIDE_VERSION}.zip")
52-
53-
# Python
54-
# https://www.python.org/downloads/source/
55-
SET(RV_DEPS_PYTHON_VERSION "3.11.9")
56-
SET(RV_DEPS_PYTHON_DOWNLOAD_HASH "392eccd4386936ffcc46ed08057db3e7")
57-
# SET(RV_DEPS_PYTHON_VERSION "3.11.14")
58-
# SET(RV_DEPS_PYTHON_DOWNLOAD_HASH "5f43ab9d5a74b9ac0dd2e20f58740f9e")
59-
60-
# Qt
61-
SET(RV_DEPS_QT_VERSION "6.5.3")
62-
SET(RV_DEPS_QT_MAJOR "6")
63-
ENDIF()
4+
# Year
5+
SET(RV_VFX_CY_YEAR
6+
"2024"
7+
)
8+
SET(RV_VFX_CY2024
9+
ON
10+
)
11+
ADD_COMPILE_DEFINITIONS(QT65ON)
12+
13+
# Boost
14+
SET(RV_DEPS_BOOST_VERSION
15+
"1.82.0"
16+
)
17+
SET(RV_DEPS_BOOST_MAJOR_MINOR_VERSION
18+
"1_82"
19+
)
20+
SET(RV_DEPS_BOOST_DOWNLOAD_HASH
21+
"f7050f554a65f6a42ece221eaeec1660"
22+
)
23+
24+
# Imath Can find the build version in OpenRV/_build/RV_DEPS_IMATH/install/lib/
25+
SET(RV_DEPS_IMATH_VERSION
26+
"3.1.12"
27+
)
28+
SET(RV_DEPS_IMATH_DOWNLOAD_HASH
29+
"d4059140972da68a2b5a1287ebe5a653"
30+
)
31+
SET(RV_DEPS_IMATH_LIB_VER
32+
"29.11.0"
33+
)
34+
SET(RV_DEPS_IMATH_LIB_MAJOR
35+
"3_1"
36+
)
37+
38+
# NumPy https://numpy.org/doc/stable/release.html
39+
SET(ENV{RV_DEPS_NUMPY_VERSION}
40+
"1.24.4"
41+
)
42+
43+
# OCIO https://github.com/AcademySoftwareFoundation/OpenColorIO
44+
SET(RV_DEPS_OCIO_VERSION
45+
"2.3.2"
46+
)
47+
SET(RV_DEPS_OCIO_VERSION_SHORT
48+
"2_3"
49+
)
50+
SET(RV_DEPS_OCIO_DOWNLOAD_HASH
51+
"9eb7834a7cc66b14f0251b7673be0d81"
52+
)
53+
54+
# OpenEXR https://github.com/AcademySoftwareFoundation/openexr/releases
55+
SET(RV_DEPS_OPENEXR_VERSION
56+
"3.2.5"
57+
)
58+
SET(RV_DEPS_OPENEXR_DOWNLOAD_HASH
59+
"838dfec3bb2a60fee02cc4f0378b6a5c"
60+
)
61+
SET(RV_DEPS_OPENEXR_LIBNAME_SUFFIX
62+
"3_2"
63+
)
64+
SET(RV_DEPS_OPENEXR_LIB_VERSION_SUFFIX
65+
"31.${RV_DEPS_OPENEXR_VERSION}"
66+
)
67+
SET(RV_DEPS_OPENEXR_PATCH_NAME
68+
"openexr_${RV_DEPS_OPENEXR_VERSION}_invalid_to_black"
69+
)
70+
71+
# OpenSSL https://github.com/openssl/openssl
72+
SET(RV_DEPS_OPENSSL_VERSION
73+
"3.4.0"
74+
)
75+
SET(RV_DEPS_OPENSSL_HASH
76+
"34733f7be2d60ecd8bd9ddb796e182af"
77+
)
78+
SET(RV_DEPS_OPENSSL_VERSION_DOT
79+
".3"
80+
)
81+
SET(RV_DEPS_OPENSSL_VERSION_UNDERSCORE
82+
"3"
83+
)
84+
85+
# PySide
86+
SET(RV_DEPS_PYSIDE_VERSION
87+
"6.5.3"
88+
)
89+
SET(RV_DEPS_PYSIDE_DOWNLOAD_HASH
90+
"515d3249c6e743219ff0d7dd25b8c8d8"
91+
)
92+
SET(RV_DEPS_PYSIDE_TARGET
93+
"RV_DEPS_PYSIDE6"
94+
)
95+
SET(RV_DEPS_PYSIDE_ARCHIVE_URL
96+
"https://mirrors.ocf.berkeley.edu/qt/official_releases/QtForPython/pyside6/PySide6-${RV_DEPS_PYSIDE_VERSION}-src/pyside-setup-everywhere-src-${RV_DEPS_PYSIDE_VERSION}.zip"
97+
)
98+
99+
# Python https://www.python.org/downloads/source/
100+
SET(RV_DEPS_PYTHON_VERSION
101+
"3.11.9"
102+
)
103+
SET(RV_DEPS_PYTHON_DOWNLOAD_HASH
104+
"392eccd4386936ffcc46ed08057db3e7"
105+
)
106+
# SET(RV_DEPS_PYTHON_VERSION "3.11.14") SET(RV_DEPS_PYTHON_DOWNLOAD_HASH "5f43ab9d5a74b9ac0dd2e20f58740f9e")
107+
108+
# Qt
109+
SET(RV_DEPS_QT_VERSION
110+
"6.5.3"
111+
)
112+
SET(RV_DEPS_QT_MAJOR
113+
"6"
114+
)
115+
ENDIF()

0 commit comments

Comments
 (0)