Skip to content

Commit f182134

Browse files
pierre-mercspierre-mercs
committed
Add Support for Nuke 11.1 and 12.1.
1 parent a9786f7 commit f182134

File tree

8 files changed

+109
-3
lines changed

8 files changed

+109
-3
lines changed

‎CMakeLists.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ IF(BUILD_PLUGINS)
3737
FIND_PACKAGE ( OpenImageIO REQUIRED )
3838
FIND_PACKAGE ( Nuke90 )
3939
FIND_PACKAGE ( Nuke105 )
40+
FIND_PACKAGE ( Nuke111 )
4041
FIND_PACKAGE ( Nuke112 )
4142
FIND_PACKAGE ( Nuke113 )
4243
FIND_PACKAGE ( Nuke120 )
44+
FIND_PACKAGE ( Nuke121 )
4345
FIND_PACKAGE ( OFX )
4446
ENDIF()
4547

@@ -91,6 +93,9 @@ IF(BUILD_PLUGINS)
9193
IF(Nuke105_FOUND)
9294
ADD_SUBDIRECTORY (nuke10.5)
9395
ENDIF()
96+
IF(Nuke111_FOUND)
97+
ADD_SUBDIRECTORY (nuke11.1)
98+
ENDIF()
9499
IF(Nuke112_FOUND)
95100
ADD_SUBDIRECTORY (nuke11.2)
96101
ENDIF()
@@ -100,4 +105,7 @@ IF(BUILD_PLUGINS)
100105
IF(Nuke120_FOUND)
101106
ADD_SUBDIRECTORY (nuke12.0)
102107
ENDIF()
108+
IF(Nuke121_FOUND)
109+
ADD_SUBDIRECTORY (nuke12.1)
110+
ENDIF()
103111
ENDIF()

‎build_scripts/build_windows.sh‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ fi
111111
if [ ! "$NUKE105_DIR" ]; then
112112
NUKE105_DIR="D:\\Nuke\\Nuke10.5v8"
113113
fi
114+
if [ ! "$NUKE111_DIR" ]; then
115+
NUKE111_DIR="D:\\Nuke\\Nuke11.1v6"
116+
fi
114117
if [ ! "$NUKE112_DIR" ]; then
115118
NUKE112_DIR="D:\\Nuke\\Nuke11.2v7"
116119
fi
@@ -120,6 +123,9 @@ fi
120123
if [ ! "$NUKE120_DIR" ]; then
121124
NUKE120_DIR="D:\\Nuke\\Nuke12.0v3"
122125
fi
126+
if [ ! "$NUKE121_DIR" ]; then
127+
NUKE121_DIR="D:\\Nuke\\Nuke12.1v2"
128+
fi
123129

124130
cd ..
125131
mkdir -p build2010
@@ -154,8 +160,8 @@ echo -e "\e[93m## Generating 2015 Makefiles ##\e[0m"
154160
echo -e "\e[93m#################################\e[0m"
155161

156162
cd $BUILD_FOLDER/release
157-
echo -e "\e[96mcmake -G \"$MSVC_VER\" -A $MSVC_ARCH ../../ -D USE_CONAN=1 -D BUILD_LIB=1 -D BUILD_PLUGINS=1 -D NUKE112_DIR=${NUKE112_DIR} -D NUKE113_DIR=${NUKE113_DIR} -D NUKE120_DIR=${NUKE120_DIR} \e[0m"
158-
cmake -G "$MSVC_VER" -A $MSVC_ARCH ../../ -D USE_CONAN=1 -D BUILD_LIB=1 -D BUILD_PLUGINS=1 -D NUKE112_DIR=${NUKE112_DIR} -D NUKE113_DIR=${NUKE113_DIR} -D NUKE120_DIR=${NUKE120_DIR}
163+
echo -e "\e[96mcmake -G \"$MSVC_VER\" -A $MSVC_ARCH ../../ -D USE_CONAN=1 -D BUILD_LIB=1 -D BUILD_PLUGINS=1 -D NUKE111_DIR=${NUKE111_DIR} -D NUKE112_DIR=${NUKE112_DIR} -D NUKE113_DIR=${NUKE113_DIR} -D NUKE120_DIR=${NUKE120_DIR} -D NUKE121_DIR=${NUKE121_DIR} \e[0m"
164+
cmake -G "$MSVC_VER" -A $MSVC_ARCH ../../ -D USE_CONAN=1 -D BUILD_LIB=1 -D BUILD_PLUGINS=1 -D NUKE111_DIR=${NUKE111_DIR} -D NUKE112_DIR=${NUKE112_DIR} -D NUKE113_DIR=${NUKE113_DIR} -D NUKE120_DIR=${NUKE120_DIR} -D NUKE121_DIR=${NUKE121_DIR}
159165
cd ../..
160166

161167
echo -e "\e[93m#################################\e[0m"
@@ -164,9 +170,11 @@ echo -e "\e[93m#################################\e[0m"
164170

165171
cd $BUILD_FOLDER/release
166172
cmake --build . --target OpenEXRIdOFX --config Release
173+
cmake --build . --target OpenEXRIdForNuke11.1 --config Release
167174
cmake --build . --target OpenEXRIdForNuke11.2 --config Release
168175
cmake --build . --target OpenEXRIdForNuke11.3 --config Release
169176
cmake --build . --target OpenEXRIdForNuke12.0 --config Release
177+
cmake --build . --target OpenEXRIdForNuke12.1 --config Release
170178
cd ../..
171179

172180

‎build_scripts/linux/build-conan.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,11 @@ function prebuild()
4242
prebuild ${BUILD_ROOT}/build_scripts/linux/docker/conan_profile_linux
4343
make -j`nproc` OpenEXRIdOFX
4444
make -j`nproc` OpenEXRIdForNuke10.5
45+
make -j`nproc` OpenEXRIdForNuke11.1
4546
make -j`nproc` OpenEXRIdForNuke11.2
4647
make -j`nproc` OpenEXRIdForNuke11.3
4748
make -j`nproc` OpenEXRIdForNuke12.0
49+
make -j`nproc` OpenEXRIdForNuke12.1
4850

4951
# Build libraries relying on gcc-4.1
5052
prebuild ${BUILD_ROOT}/build_scripts/linux/docker/conan_profile_linux_gcc4.1

‎cmake/Modules/FindNuke111.cmake‎

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

‎cmake/Modules/FindNuke121.cmake‎

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

‎nuke11.1/CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
SET(NDK_VERSION 11.1)
3+
SET(NDK_PATH ${NUKE111_LIBRARY_DIR})
4+
SET(NDK_LIBRARIES ${DDIMAGE111_LIBRARY})
5+
6+
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/../nuke/nuke.cmake)

‎nuke12.1/CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
SET(NDK_VERSION 12.1)
3+
SET(NDK_PATH ${NUKE121_LIBRARY_DIR})
4+
SET(NDK_LIBRARIES ${DDIMAGE121_LIBRARY})
5+
6+
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
@@ -20,6 +20,6 @@
2020
namespace openexrid
2121
{
2222

23-
std::string Version = "1.0-beta.20";
23+
std::string Version = "1.0-beta.21";
2424

2525
}

0 commit comments

Comments
 (0)