Skip to content

Commit 1ec6dff

Browse files
committed
[Nuke] Add support for Nuke 16.0
1 parent eb3ad57 commit 1ec6dff

File tree

7 files changed

+65
-7
lines changed

7 files changed

+65
-7
lines changed

.build_env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@
4040
#export NUKE132_DIR="D:\\Nuke\\Nuke13.2v7"
4141
#export NUKE140_DIR="D:\\Nuke\\Nuke14.0v4"
4242
#export NUKE151_DIR="D:\\Nuke\\Nuke15.1v3"
43+
#export NUKE160_DIR="D:\\Nuke\\Nuke16.0v2"

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ IF(BUILD_PLUGINS)
4646
FIND_PACKAGE ( Nuke132 )
4747
FIND_PACKAGE ( Nuke140 )
4848
FIND_PACKAGE ( Nuke151 )
49+
FIND_PACKAGE ( Nuke160 )
4950
FIND_PACKAGE ( OFX )
5051
ENDIF()
5152

@@ -120,4 +121,7 @@ IF(BUILD_PLUGINS)
120121
IF(Nuke151_FOUND)
121122
ADD_SUBDIRECTORY (nuke15.1)
122123
ENDIF()
124+
IF(Nuke160_FOUND)
125+
ADD_SUBDIRECTORY (nuke16.0)
126+
ENDIF()
123127
ENDIF()

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,8 @@ if [ "$machine" == "Windows" ]; then
305305
ConanUpdate ${root_directory}/build_tools/conan_profile_windows_vs2019
306306
CMAKE_BUILD_TYPE=$config conan build --install-folder ${build_directory}/Conan/ --source-folder ${root_directory} --build-folder ${build_directory}/build2019 --package-folder ${build_root_directory}/bin ${conan_actions} ${root_directory}/conanfile.py
307307

308-
ConanUpdate ${root_directory}/build_tools/conan_profile_windows_vs2015
309-
CMAKE_BUILD_TYPE=$config conan build --install-folder ${build_directory}/Conan/ --source-folder ${root_directory} --build-folder ${build_directory}/build2015 --package-folder ${build_root_directory}/bin ${conan_actions} ${root_directory}/conanfile.py
308+
#ConanUpdate ${root_directory}/build_tools/conan_profile_windows_vs2015
309+
#CMAKE_BUILD_TYPE=$config conan build --install-folder ${build_directory}/Conan/ --source-folder ${root_directory} --build-folder ${build_directory}/build2015 --package-folder ${build_root_directory}/bin ${conan_actions} ${root_directory}/conanfile.py
310310
else
311311
mkdir -p ${build_directory}/buildgcc48
312312
mkdir -p ${build_directory}/buildgcc93

cmake/Modules/FindNuke160.cmake

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
2+
IF(WIN32)
3+
4+
find_library (DDIMAGE160_LIBRARY DDImage
5+
${NUKE160_DIR}
6+
$ENV{NUKE160_DIR}
7+
"C:/Program\ Files/Nuke\ 16.0v1"
8+
"C:/Program\ Files/Nuke\ 16.0v2"
9+
"C:/Program\ Files/Nuke\ 16.0v3"
10+
"C:/Program\ Files/Nuke\ 16.0v4"
11+
"C:/Program\ Files/Nuke\ 16.0v5"
12+
"C:/Program\ Files/Nuke\ 16.0v6"
13+
"C:/Program\ Files/Nuke\ 16.0v7"
14+
"C:/Program\ Files/Nuke\ 16.0v8"
15+
"C:/Program\ Files/Nuke\ 16.0v9"
16+
)
17+
18+
ELSEIF(UNIX)
19+
20+
find_library (DDIMAGE160_LIBRARY DDImage
21+
${NUKE160_DIR}
22+
$ENV{NUKE160_DIR}
23+
"/usr/local/Nuke16.0v1"
24+
"/usr/local/Nuke16.0v2"
25+
"/usr/local/Nuke16.0v3"
26+
"/usr/local/Nuke16.0v4"
27+
"/usr/local/Nuke16.0v5"
28+
"/usr/local/Nuke16.0v6"
29+
"/usr/local/Nuke16.0v7"
30+
"/usr/local/Nuke16.0v8"
31+
"/usr/local/Nuke16.0v9"
32+
)
33+
34+
ENDIF()
35+
36+
get_filename_component (NUKE160_LIBRARY_DIR ${DDIMAGE160_LIBRARY} DIRECTORY)
37+
find_path (NUKE160_INCLUDE_DIR DDImage/Op.h ${NUKE160_LIBRARY_DIR}/include)
38+
39+
INCLUDE(FindPackageHandleStandardArgs)
40+
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Nuke160 DEFAULT_MSG
41+
DDIMAGE160_LIBRARY NUKE160_LIBRARY_DIR NUKE160_INCLUDE_DIR
42+
)

conanfile.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class OpenEXRIdConan(ConanFile):
99
name = "OpenExrId"
10-
version = "1.0-beta.29"
10+
version = "1.0-beta.30"
1111
license = "MIT"
1212
url = "https://github.com/MercenariesEngineering/openexrid"
1313
description = "OpenEXR files able to isolate any object of a CG image with a perfect antialiazing "
@@ -45,13 +45,15 @@ def requirements(self):
4545
self.requires("re2/2019-06-01@mercseng/v0")
4646
self.requires("libpng/1.6.37@mercseng/v0")
4747
self.requires("boost/1.73.0@mercseng/v2")
48+
self.requires("tbb/2020.02@mercseng/v3")
4849
elif self.settings.compiler.version == 16:
4950
# Nuke 14+
50-
self.requires("OpenImageIO/2.1.15.0@mercseng/v2")
51+
self.requires("OpenImageIO/2.1.15.0@mercseng/v4")
5152
self.requires("OpenEXR/2.5.1@mercseng/v0")
5253
self.requires("re2/2019-06-01@mercseng/v1")
5354
self.requires("libpng/1.6.37@mercseng/v0")
5455
self.requires("boost/1.73.0@mercseng/v6")
56+
self.requires("tbb/2020.02@mercseng/v3")
5557

5658
def configure(self):
5759
if self.settings.os == "Linux":
@@ -110,7 +112,7 @@ def build(self):
110112
if self.options.build_lib:
111113
targets.extend(["LibOpenEXRId"])
112114
if self.options.build_plugins:
113-
targets.extend(["OpenEXRIdForNuke14.0", "OpenEXRIdForNuke15.1"])
115+
targets.extend(["OpenEXRIdForNuke14.0", "OpenEXRIdForNuke15.1", "OpenEXRIdForNuke16.0"])
114116
elif self.settings.compiler == "gcc":
115117
if self.settings.compiler.version == 4.8:
116118
# gcc 4.8, Nuke 11-13
@@ -121,7 +123,7 @@ def build(self):
121123
if self.options.build_lib:
122124
targets.extend(["LibOpenEXRId"])
123125
if self.options.build_plugins:
124-
targets.extend(["OpenEXRIdOFX", "OpenEXRIdForNuke14.0", "OpenEXRIdForNuke15.1"])
126+
targets.extend(["OpenEXRIdOFX", "OpenEXRIdForNuke14.0", "OpenEXRIdForNuke15.1", "OpenEXRIdForNuke16.0"])
125127

126128
for t in targets:
127129
cmake.build(target=t)

nuke16.0/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
SET(NDK_VERSION 16.0)
3+
SET(NDK_PATH ${NUKE160_LIBRARY_DIR})
4+
SET(NDK_LIBRARIES ${DDIMAGE160_LIBRARY})
5+
6+
ADD_DEFINITIONS(-DNOMINMAX)
7+
ADD_DEFINITIONS(-D_USE_MATH_DEFINES)
8+
9+
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/../nuke/nuke.cmake)

openexrid/Version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
namespace openexrid
2222
{
2323

24-
std::string Version = "1.0-beta.29";
24+
std::string Version = "1.0-beta.30";
2525

2626
}

0 commit comments

Comments
 (0)