Skip to content

Commit e7bbe2f

Browse files
david-cattermoledavid-cattermole
committed
Build System - Extract OpenColorIO source code into build directory
... to keep the source tree clean while building. Before: ${PROJECT_ROOT}/external/working/maya${MAYA_VERSION}_linux/ %PROJECT_ROOT%\external\working\maya%MAYA_VERSION%_windows64\ After: ${BUILD_OCIO_DIR_BASE}/source/maya${MAYA_VERSION}_linux/ %BUILD_OCIO_DIR_BASE%\source\maya%MAYA_VERSION%_windows64\
1 parent f0f28f2 commit e7bbe2f

7 files changed

Lines changed: 176 additions & 126 deletions

‎external/working/README.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎scripts/internal/build_mmSolverLibs_linux.bash‎

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,17 @@ echo "Project Root: ${PROJECT_ROOT}"
4646
if [ -z "$BUILD_DIR_BASE" ]; then
4747
BUILD_DIR_BASE="${PROJECT_ROOT}/.."
4848
fi
49-
echo "Build directory base: ${BUILD_DIR_BASE}"
49+
echo "Build root directory base: ${BUILD_DIR_BASE}"
50+
51+
# OpenColorIO build dir.
52+
BUILD_OCIO_DIR_NAME="build_opencolorio"
53+
BUILD_OCIO_DIR_BASE="${BUILD_DIR_BASE}/${BUILD_OCIO_DIR_NAME}"
54+
echo "Build OpenColorIO directory base: ${BUILD_OCIO_DIR_BASE}"
55+
56+
# mmSolverLibs build dir.
57+
BUILD_MMSOLVERLIBS_DIR_NAME="build_mmsolverlibs"
58+
BUILD_MMSOLVERLIBS_DIR_BASE="${BUILD_DIR_BASE}/${BUILD_MMSOLVERLIBS_DIR_NAME}"
59+
echo "Build mmSolverLibs directory base: ${BUILD_MMSOLVERLIBS_DIR_BASE}"
5060

5161
# What type of build? "Release" or "Debug"?
5262
BUILD_TYPE="Release"
@@ -64,36 +74,36 @@ fi
6474
MMSOLVER_BUILD_VERBOSE=OFF
6575

6676
# Where to find the mmsolverlibs Rust libraries and headers.
67-
MMSOLVERLIBS_INSTALL_PATH="${BUILD_DIR_BASE}/build_mmsolverlibs/install/maya${MAYA_VERSION}_linux/"
77+
MMSOLVERLIBS_INSTALL_PATH="${BUILD_MMSOLVERLIBS_DIR_BASE}/install/maya${MAYA_VERSION}_linux/"
6878
MMSOLVERLIBS_ROOT="${PROJECT_ROOT}/lib"
6979
MMSOLVERLIBS_RUST_ROOT="${MMSOLVERLIBS_ROOT}/mmsolverlibs"
70-
MMSOLVERLIBS_CPP_TARGET_DIR="${BUILD_DIR_BASE}/build_mmsolverlibs/rust_linux_maya${MAYA_VERSION}"
80+
MMSOLVERLIBS_CPP_TARGET_DIR="${BUILD_MMSOLVERLIBS_DIR_BASE}/rust_linux_maya${MAYA_VERSION}"
7181
MMSOLVERLIBS_LIB_DIR="${MMSOLVERLIBS_CPP_TARGET_DIR}/${BUILD_TYPE_DIR}"
7282
MMSOLVERLIBS_INCLUDE_DIR="${MMSOLVERLIBS_ROOT}/include"
7383

7484
# Paths for dependencies.
75-
EXTERNAL_BUILD_DIR="${BUILD_DIR_BASE}/build_opencolorio/cmake_linux_maya${MAYA_VERSION}_${BUILD_TYPE}/ext/dist"
76-
OPENCOLORIO_INSTALL_DIR="${BUILD_DIR_BASE}/build_opencolorio/install/maya${MAYA_VERSION}_linux/"
77-
OPENCOLORIO_CMAKE_CONFIG_DIR="${OPENCOLORIO_INSTALL_DIR}/lib64/cmake/OpenColorIO/"
78-
OPENCOLORIO_CMAKE_FIND_MODULES_DIR="${PROJECT_ROOT}/external/working/maya${MAYA_VERSION}_linux/${OPENCOLORIO_TARBALL_EXTRACTED_DIR_NAME}/share/cmake/modules"
85+
EXTERNAL_OCIO_BUILD_DIR="${BUILD_OCIO_DIR_BASE}/cmake_linux_maya${MAYA_VERSION}_${BUILD_TYPE}/ext/dist"
86+
OCIO_INSTALL_DIR="${BUILD_OCIO_DIR_BASE}/install/maya${MAYA_VERSION}_linux/"
87+
OCIO_CMAKE_CONFIG_DIR="${OCIO_INSTALL_DIR}/lib64/cmake/OpenColorIO/"
88+
OCIO_CMAKE_FIND_MODULES_DIR="${BUILD_OCIO_DIR_BASE}/source/maya${MAYA_VERSION}_linux/${OPENCOLORIO_TARBALL_EXTRACTED_DIR_NAME}/share/cmake/modules"
7989

80-
expat_DIR="${EXTERNAL_BUILD_DIR}/${EXPAT_RELATIVE_CMAKE_DIR}"
81-
expat_INCLUDE_DIR="${EXTERNAL_BUILD_DIR}/include/"
82-
expat_LIBRARY="${EXTERNAL_BUILD_DIR}/${EXPAT_RELATIVE_LIB_PATH}"
90+
expat_DIR="${EXTERNAL_OCIO_BUILD_DIR}/${EXPAT_RELATIVE_CMAKE_DIR}"
91+
expat_INCLUDE_DIR="${EXTERNAL_OCIO_BUILD_DIR}/include/"
92+
expat_LIBRARY="${EXTERNAL_OCIO_BUILD_DIR}/${EXPAT_RELATIVE_LIB_PATH}"
8393

84-
pystring_LIBRARY="${EXTERNAL_BUILD_DIR}/${PYSTRING_RELATIVE_LIB_PATH}"
85-
pystring_INCLUDE_DIR="${EXTERNAL_BUILD_DIR}/include"
94+
pystring_LIBRARY="${EXTERNAL_OCIO_BUILD_DIR}/${PYSTRING_RELATIVE_LIB_PATH}"
95+
pystring_INCLUDE_DIR="${EXTERNAL_OCIO_BUILD_DIR}/include"
8696

87-
yaml_DIR="${EXTERNAL_BUILD_DIR}/${YAML_RELATIVE_CMAKE_DIR}"
88-
yaml_LIBRARY="${EXTERNAL_BUILD_DIR}/${YAML_RELATIVE_LIB_PATH}"
89-
yaml_INCLUDE_DIR="${EXTERNAL_BUILD_DIR}/include/"
97+
yaml_DIR="${EXTERNAL_OCIO_BUILD_DIR}/${YAML_RELATIVE_CMAKE_DIR}"
98+
yaml_LIBRARY="${EXTERNAL_OCIO_BUILD_DIR}/${YAML_RELATIVE_LIB_PATH}"
99+
yaml_INCLUDE_DIR="${EXTERNAL_OCIO_BUILD_DIR}/include/"
90100

91-
Imath_DIR="${EXTERNAL_BUILD_DIR}/lib64/cmake/Imath"
101+
Imath_DIR="${EXTERNAL_OCIO_BUILD_DIR}/lib64/cmake/Imath"
92102

93-
ZLIB_LIBRARY="${EXTERNAL_BUILD_DIR}/${ZLIB_RELATIVE_LIB_PATH}"
94-
ZLIB_INCLUDE_DIR="${EXTERNAL_BUILD_DIR}/include/"
103+
ZLIB_LIBRARY="${EXTERNAL_OCIO_BUILD_DIR}/${ZLIB_RELATIVE_LIB_PATH}"
104+
ZLIB_INCLUDE_DIR="${EXTERNAL_OCIO_BUILD_DIR}/include/"
95105

96-
minizip_DIR="${EXTERNAL_BUILD_DIR}/lib64/cmake/minizip-ng"
106+
minizip_DIR="${EXTERNAL_OCIO_BUILD_DIR}/lib64/cmake/minizip-ng"
97107

98108
MMSOLVERLIBS_BUILD_TESTS=1
99109

@@ -126,7 +136,7 @@ LDPK_URL="${PROJECT_ROOT}/external/archives/ldpk-2.12.0.tar"
126136
# Build project
127137
cd ${BUILD_DIR_BASE}
128138
BUILD_DIR_NAME="cmake_linux_maya${MAYA_VERSION}_${BUILD_TYPE}"
129-
BUILD_DIR="${BUILD_DIR_BASE}/build_mmsolverlibs/${BUILD_DIR_NAME}"
139+
BUILD_DIR="${BUILD_MMSOLVERLIBS_DIR_BASE}/${BUILD_DIR_NAME}"
130140
mkdir -p ${BUILD_DIR}
131141
cd ${BUILD_DIR}
132142

@@ -138,15 +148,15 @@ ${CMAKE_EXE} \
138148
-DCMAKE_POSITION_INDEPENDENT_CODE=1 \
139149
-DCMAKE_CXX_STANDARD=${CXX_STANDARD} \
140150
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
141-
-DCMAKE_MODULE_PATH=${OPENCOLORIO_CMAKE_FIND_MODULES_DIR} \
151+
-DCMAKE_MODULE_PATH=${OCIO_CMAKE_FIND_MODULES_DIR} \
142152
-DCMAKE_VERBOSE_MAKEFILE=${MMSOLVER_BUILD_VERBOSE} \
143153
-DMMSOLVER_VFX_PLATFORM=${VFX_PLATFORM} \
144154
-DMMSOLVER_DEBUG=${MMSOLVER_DEBUG} \
145155
-DMMSOLVERLIBS_CXXBRIDGE_EXE=${MMSOLVERLIBS_CXXBRIDGE_EXE} \
146156
-DMMSOLVERLIBS_BUILD_TESTS=${MMSOLVERLIBS_BUILD_TESTS} \
147157
-DMMSOLVERLIBS_LIB_DIR=${MMSOLVERLIBS_LIB_DIR} \
148158
-Dldpk_URL=${LDPK_URL} \
149-
-DOpenColorIO_DIR=${OPENCOLORIO_CMAKE_CONFIG_DIR} \
159+
-DOpenColorIO_DIR=${OCIO_CMAKE_CONFIG_DIR} \
150160
-DOCIO_INSTALL_EXT_PACKAGES=NONE \
151161
-Dexpat_DIR=${expat_DIR} \
152162
-Dexpat_LIBRARY=${expat_LIBRARY} \

‎scripts/internal/build_mmSolverLibs_windows64.bat‎

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,17 @@ ECHO Project Root: %PROJECT_ROOT%
3535
:: Note: BUILD_DIR_BASE should already be set by the calling script.
3636
:: If not, use default location.
3737
IF "%BUILD_DIR_BASE%"=="" SET BUILD_DIR_BASE=%PROJECT_ROOT%\..
38-
ECHO Build directory base: %BUILD_DIR_BASE%
38+
ECHO Build root directory base: %BUILD_DIR_BASE%
39+
40+
:: OpenColorIO build dir.
41+
SET BUILD_OCIO_DIR_NAME=build_opencolorio
42+
SET BUILD_OCIO_DIR_BASE=%BUILD_DIR_BASE%\%BUILD_OCIO_DIR_NAME%
43+
ECHO Build OpenColorIO directory base: %BUILD_OCIO_DIR_BASE%
44+
45+
:: mmSolverLibs build dir.
46+
SET BUILD_MMSOLVERLIBS_DIR_NAME=build_mmsolverlibs
47+
SET BUILD_MMSOLVERLIBS_DIR_BASE=%BUILD_DIR_BASE%\%BUILD_MMSOLVERLIBS_DIR_NAME%
48+
ECHO Build mmSolverLibs directory base: %BUILD_MMSOLVERLIBS_DIR_BASE%
3949

4050
:: What type of build? "Release" or "Debug"?
4151
SET BUILD_TYPE=Release
@@ -53,41 +63,41 @@ IF "%BUILD_TYPE%"=="Release" (
5363
SET MMSOLVER_BUILD_VERBOSE=OFF
5464

5565
:: Where to find the mmsolverlibs Rust libraries and headers.
56-
SET MMSOLVERLIBS_INSTALL_PATH=%BUILD_DIR_BASE%\build_mmsolverlibs\install\maya%MAYA_VERSION%_windows64\
66+
SET MMSOLVERLIBS_INSTALL_PATH=%BUILD_MMSOLVERLIBS_DIR_BASE%\install\maya%MAYA_VERSION%_windows64\
5767
SET MMSOLVERLIBS_ROOT=%PROJECT_ROOT%\lib
5868
SET MMSOLVERLIBS_RUST_ROOT=%MMSOLVERLIBS_ROOT%\mmsolverlibs
59-
SET MMSOLVERLIBS_CPP_TARGET_DIR=%BUILD_DIR_BASE%\build_mmsolverlibs\rust_windows64_maya%MAYA_VERSION%
69+
SET MMSOLVERLIBS_CPP_TARGET_DIR=%BUILD_MMSOLVERLIBS_DIR_BASE%\rust_windows64_maya%MAYA_VERSION%
6070
SET MMSOLVERLIBS_LIB_DIR=%MMSOLVERLIBS_CPP_TARGET_DIR%\%BUILD_TYPE_DIR%
6171
SET MMSOLVERLIBS_INCLUDE_DIR=%MMSOLVERLIBS_ROOT%\include
6272

6373
SET MMSOLVERLIBS_BUILD_TESTS=1
6474

6575
:: Paths for dependencies.
66-
SET EXTERNAL_BUILD_DIR=%BUILD_DIR_BASE%\build_opencolorio\cmake_win64_maya%MAYA_VERSION%_%BUILD_TYPE%\ext\dist
67-
SET OPENCOLORIO_INSTALL_DIR=%BUILD_DIR_BASE%\build_opencolorio\install\maya%MAYA_VERSION%_windows64\
68-
SET OPENCOLORIO_CMAKE_CONFIG_DIR=%OPENCOLORIO_INSTALL_DIR%\lib\cmake\OpenColorIO\
69-
SET OPENCOLORIO_CMAKE_FIND_MODULES_DIR=%PROJECT_ROOT%\external\working\maya%MAYA_VERSION%_windows64\%OPENCOLORIO_TARBALL_EXTRACTED_DIR_NAME%\share\cmake\modules
76+
SET EXTERNAL_OCIO_BUILD_DIR=%BUILD_OCIO_DIR_BASE%\cmake_win64_maya%MAYA_VERSION%_%BUILD_TYPE%\ext\dist
77+
SET OCIO_INSTALL_DIR=%BUILD_OCIO_DIR_BASE%\install\maya%MAYA_VERSION%_windows64\
78+
SET OCIO_CMAKE_CONFIG_DIR=%OCIO_INSTALL_DIR%\lib\cmake\OpenColorIO\
79+
SET OCIO_CMAKE_FIND_MODULES_DIR=%BUILD_OCIO_DIR_BASE%\source\maya%MAYA_VERSION%_windows64\%OPENCOLORIO_TARBALL_EXTRACTED_DIR_NAME%\share\cmake\modules
7080
:: Convert back-slashes to forward-slashes.
7181
:: https://stackoverflow.com/questions/23542453/change-backslash-to-forward-slash-in-windows-batch-file
72-
SET "OPENCOLORIO_CMAKE_FIND_MODULES_DIR=%OPENCOLORIO_CMAKE_FIND_MODULES_DIR:\=/%"
82+
SET "OCIO_CMAKE_FIND_MODULES_DIR=%OCIO_CMAKE_FIND_MODULES_DIR:\=/%"
7383

74-
SET expat_DIR=%EXTERNAL_BUILD_DIR%\%EXPAT_RELATIVE_CMAKE_DIR%
75-
SET expat_INCLUDE_DIR=%EXTERNAL_BUILD_DIR%\include\
76-
SET expat_LIBRARY=%EXTERNAL_BUILD_DIR%\%EXPAT_RELATIVE_LIB_PATH%
84+
SET expat_DIR=%EXTERNAL_OCIO_BUILD_DIR%\%EXPAT_RELATIVE_CMAKE_DIR%
85+
SET expat_INCLUDE_DIR=%EXTERNAL_OCIO_BUILD_DIR%\include\
86+
SET expat_LIBRARY=%EXTERNAL_OCIO_BUILD_DIR%\%EXPAT_RELATIVE_LIB_PATH%
7787

78-
SET pystring_INCLUDE_DIR=%EXTERNAL_BUILD_DIR%\include
79-
SET pystring_LIBRARY=%EXTERNAL_BUILD_DIR%\%PYSTRING_RELATIVE_LIB_PATH%
88+
SET pystring_INCLUDE_DIR=%EXTERNAL_OCIO_BUILD_DIR%\include
89+
SET pystring_LIBRARY=%EXTERNAL_OCIO_BUILD_DIR%\%PYSTRING_RELATIVE_LIB_PATH%
8090

81-
SET yaml_DIR=%EXTERNAL_BUILD_DIR%\%YAML_RELATIVE_CMAKE_DIR%
82-
SET yaml_LIBRARY=%EXTERNAL_BUILD_DIR%\%YAML_RELATIVE_LIB_PATH%
83-
SET yaml_INCLUDE_DIR=%EXTERNAL_BUILD_DIR%\include\
91+
SET yaml_DIR=%EXTERNAL_OCIO_BUILD_DIR%\%YAML_RELATIVE_CMAKE_DIR%
92+
SET yaml_LIBRARY=%EXTERNAL_OCIO_BUILD_DIR%\%YAML_RELATIVE_LIB_PATH%
93+
SET yaml_INCLUDE_DIR=%EXTERNAL_OCIO_BUILD_DIR%\include\
8494

85-
SET Imath_DIR=%EXTERNAL_BUILD_DIR%\lib\cmake\Imath
95+
SET Imath_DIR=%EXTERNAL_OCIO_BUILD_DIR%\lib\cmake\Imath
8696

87-
SET ZLIB_INCLUDE_DIR=%EXTERNAL_BUILD_DIR%\include\
88-
SET ZLIB_LIBRARY=%EXTERNAL_BUILD_DIR%\%ZLIB_RELATIVE_LIB_PATH%
97+
SET ZLIB_INCLUDE_DIR=%EXTERNAL_OCIO_BUILD_DIR%\include\
98+
SET ZLIB_LIBRARY=%EXTERNAL_OCIO_BUILD_DIR%\%ZLIB_RELATIVE_LIB_PATH%
8999

90-
SET minizip_DIR=%EXTERNAL_BUILD_DIR%\%MINIZIP_RELATIVE_CMAKE_DIR%
100+
SET minizip_DIR=%EXTERNAL_OCIO_BUILD_DIR%\%MINIZIP_RELATIVE_CMAKE_DIR%
91101

92102
ECHO Building mmsolverlibs... (%MMSOLVERLIBS_ROOT%)
93103

@@ -163,13 +173,13 @@ SET CMAKE_CXX_COMPILER=cl
163173

164174
:: Build project
165175
SET BUILD_DIR_NAME=cmake_win64_maya%MAYA_VERSION%_%BUILD_TYPE%
166-
SET BUILD_DIR=%BUILD_DIR_BASE%\build_mmsolverlibs\%BUILD_DIR_NAME%
176+
SET BUILD_DIR=%BUILD_MMSOLVERLIBS_DIR_BASE%\%BUILD_DIR_NAME%
167177
ECHO BUILD_DIR_BASE: %BUILD_DIR_BASE%
168178
ECHO BUILD_DIR_NAME: %BUILD_DIR_NAME%
169179
ECHO BUILD_DIR: %BUILD_DIR%
170180
CHDIR "%BUILD_DIR_BASE%"
171-
MKDIR "build_mmsolverlibs"
172-
CHDIR "%BUILD_DIR_BASE%\build_mmsolverlibs\"
181+
MKDIR "%BUILD_MMSOLVERLIBS_DIR_NAME%"
182+
CHDIR "%BUILD_MMSOLVERLIBS_DIR_BASE%\"
173183
MKDIR "%BUILD_DIR_NAME%"
174184
CHDIR "%BUILD_DIR%"
175185

@@ -182,7 +192,7 @@ CHDIR "%BUILD_DIR%"
182192
-DCMAKE_C_COMPILER=%CMAKE_C_COMPILER% ^
183193
-DCMAKE_CXX_COMPILER=%CMAKE_CXX_COMPILER% ^
184194
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON ^
185-
-DCMAKE_MODULE_PATH=%OPENCOLORIO_CMAKE_FIND_MODULES_DIR% ^
195+
-DCMAKE_MODULE_PATH=%OCIO_CMAKE_FIND_MODULES_DIR% ^
186196
-DCMAKE_VERBOSE_MAKEFILE=%MMSOLVER_BUILD_VERBOSE% ^
187197
-DBUILD_DATE_TIME="%BUILD_DATE_TIME%" ^
188198
-DGIT_BRANCH=%GIT_BRANCH% ^
@@ -194,7 +204,7 @@ CHDIR "%BUILD_DIR%"
194204
-DMMSOLVERLIBS_BUILD_TESTS=%MMSOLVERLIBS_BUILD_TESTS% ^
195205
-DMMSOLVERLIBS_LIB_DIR=%MMSOLVERLIBS_LIB_DIR% ^
196206
-Dldpk_URL=%LDPK_URL% ^
197-
-DOpenColorIO_DIR=%OPENCOLORIO_CMAKE_CONFIG_DIR% ^
207+
-DOpenColorIO_DIR=%OCIO_CMAKE_CONFIG_DIR% ^
198208
-DOCIO_INSTALL_EXT_PACKAGES=NONE ^
199209
-Dexpat_DIR=%expat_DIR% ^
200210
-Dexpat_LIBRARY=%expat_LIBRARY% ^

‎scripts/internal/build_mmSolver_linux.bash‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,17 @@ BUILD_PACKAGE=1
6161
if [ -z "$BUILD_DIR_BASE" ]; then
6262
BUILD_DIR_BASE="${PROJECT_ROOT}/.."
6363
fi
64-
echo "Build directory base: ${BUILD_DIR_BASE}"
64+
echo "Build root directory base: ${BUILD_DIR_BASE}"
65+
66+
# OpenColorIO build dir.
67+
BUILD_OCIO_DIR_NAME="build_opencolorio"
68+
BUILD_OCIO_DIR_BASE="${BUILD_DIR_BASE}/${BUILD_OCIO_DIR_NAME}"
69+
echo "Build OpenColorIO directory base: ${BUILD_OCIO_DIR_BASE}"
70+
71+
# mmSolverLibs build dir.
72+
BUILD_MMSOLVERLIBS_DIR_NAME="build_mmsolverlibs"
73+
BUILD_MMSOLVERLIBS_DIR_BASE="${BUILD_DIR_BASE}/${BUILD_MMSOLVERLIBS_DIR_NAME}"
74+
echo "Build mmSolverLibs directory base: ${BUILD_MMSOLVERLIBS_DIR_BASE}"
6575

6676
# What type of build? "Release" or "Debug"?
6777
BUILD_TYPE=Release
@@ -102,15 +112,15 @@ PYTHON_VIRTUAL_ENV_DIR_NAME="python_venv_linux_maya${MAYA_VERSION}"
102112
source "${PROJECT_ROOT}/scripts/internal/python_venv_activate.bash"
103113

104114
# Where to find the mmsolverlibs Rust libraries and headers.
105-
MMSOLVERLIBS_INSTALL_DIR="${BUILD_DIR_BASE}/build_mmsolverlibs/install/maya${MAYA_VERSION}_linux/"
115+
MMSOLVERLIBS_INSTALL_DIR="${BUILD_MMSOLVERLIBS_DIR_BASE}/install/maya${MAYA_VERSION}_linux/"
106116
MMSOLVERLIBS_CMAKE_CONFIG_DIR="${MMSOLVERLIBS_INSTALL_DIR}/lib64/cmake/mmsolverlibs_cpp"
107-
MMSOLVERLIBS_RUST_DIR="${BUILD_DIR_BASE}/build_mmsolverlibs/rust_linux_maya${MAYA_VERSION}/${BUILD_TYPE_DIR}"
117+
MMSOLVERLIBS_RUST_DIR="${BUILD_MMSOLVERLIBS_DIR_BASE}/rust_linux_maya${MAYA_VERSION}/${BUILD_TYPE_DIR}"
108118

109119
# Paths for dependencies.
110-
EXTERNAL_BUILD_DIR="${BUILD_DIR_BASE}/build_opencolorio/cmake_linux_maya${MAYA_VERSION}_${BUILD_TYPE}/ext/dist"
111-
OPENCOLORIO_INSTALL_DIR="${BUILD_DIR_BASE}/build_opencolorio/install/maya${MAYA_VERSION}_linux/"
112-
OPENCOLORIO_CMAKE_CONFIG_DIR="${OPENCOLORIO_INSTALL_DIR}/lib64/cmake/OpenColorIO/"
113-
OPENCOLORIO_CMAKE_FIND_MODULES_DIR="${PROJECT_ROOT}/external/working/maya${MAYA_VERSION}_linux/${OPENCOLORIO_TARBALL_EXTRACTED_DIR_NAME}/share/cmake/modules"
120+
EXTERNAL_BUILD_DIR="${BUILD_OCIO_DIR_BASE}/cmake_linux_maya${MAYA_VERSION}_${BUILD_TYPE}/ext/dist"
121+
OCIO_INSTALL_DIR="${BUILD_OCIO_DIR_BASE}/install/maya${MAYA_VERSION}_linux/"
122+
OCIO_CMAKE_CONFIG_DIR="${OCIO_INSTALL_DIR}/lib64/cmake/OpenColorIO/"
123+
OCIO_CMAKE_FIND_MODULES_DIR="${BUILD_OCIO_DIR_BASE}/source/maya${MAYA_VERSION}_linux/${OPENCOLORIO_TARBALL_EXTRACTED_DIR_NAME}/share/cmake/modules"
114124

115125
expat_DIR="${EXTERNAL_BUILD_DIR}/${EXPAT_RELATIVE_CMAKE_DIR}"
116126
expat_INCLUDE_DIR="${EXTERNAL_BUILD_DIR}/include/"
@@ -148,7 +158,7 @@ ${CMAKE_EXE} \
148158
-DCMAKE_POSITION_INDEPENDENT_CODE=1 \
149159
-DCMAKE_CXX_STANDARD=${CXX_STANDARD} \
150160
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
151-
-DCMAKE_MODULE_PATH=${OPENCOLORIO_CMAKE_FIND_MODULES_DIR} \
161+
-DCMAKE_MODULE_PATH=${OCIO_CMAKE_FIND_MODULES_DIR} \
152162
-DCMAKE_VERBOSE_MAKEFILE=${MMSOLVER_BUILD_VERBOSE} \
153163
-DOPENGL_INCLUDE_DIR=${OPENGL_INCLUDE_DIR} \
154164
-DMMSOLVER_VFX_PLATFORM=${VFX_PLATFORM} \
@@ -171,7 +181,7 @@ ${CMAKE_EXE} \
171181
-DMAYA_VERSION=${MAYA_VERSION} \
172182
-Dmmsolverlibs_rust_DIR=${MMSOLVERLIBS_RUST_DIR} \
173183
-Dmmsolverlibs_cpp_DIR=${MMSOLVERLIBS_CMAKE_CONFIG_DIR} \
174-
-DOpenColorIO_DIR=${OPENCOLORIO_CMAKE_CONFIG_DIR} \
184+
-DOpenColorIO_DIR=${OCIO_CMAKE_CONFIG_DIR} \
175185
-DOCIO_INSTALL_EXT_PACKAGES=NONE \
176186
-DopenMVG_USE_AVX=1 \
177187
-DopenMVG_USE_AVX2=1 \

‎scripts/internal/build_mmSolver_windows64.bat‎

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,17 @@ ECHO Project Root: %PROJECT_ROOT%
3636
:: Note: BUILD_DIR_BASE should already be set by the calling script.
3737
:: If not, use default location.
3838
IF "%BUILD_DIR_BASE%"=="" SET BUILD_DIR_BASE=%PROJECT_ROOT%\..
39-
ECHO Build directory base: %BUILD_DIR_BASE%
39+
ECHO Build root directory base: %BUILD_DIR_BASE%
40+
41+
:: OpenColorIO build dir.
42+
SET BUILD_OCIO_DIR_NAME=build_opencolorio
43+
SET BUILD_OCIO_DIR_BASE=%BUILD_DIR_BASE%\%BUILD_OCIO_DIR_NAME%
44+
ECHO Build OpenColorIO directory base: %BUILD_OCIO_DIR_BASE%
45+
46+
:: mmSolverLibs build dir.
47+
SET BUILD_MMSOLVERLIBS_DIR_NAME=build_mmsolverlibs
48+
SET BUILD_MMSOLVERLIBS_DIR_BASE=%BUILD_DIR_BASE%\%BUILD_MMSOLVERLIBS_DIR_NAME%
49+
ECHO Build mmSolverLibs directory base: %BUILD_MMSOLVERLIBS_DIR_BASE%
4050

4151
:: Run the Python API and Solver tests inside Maya, after a
4252
:: successfully build an install process.
@@ -98,36 +108,36 @@ SET PYTHON_VIRTUAL_ENV_DIR_NAME=python_venv_windows64_maya%MAYA_VERSION%
98108
CALL %PROJECT_ROOT%\scripts\internal\python_venv_activate.bat
99109

100110
:: Paths for mmSolver library dependencies.
101-
SET MMSOLVERLIBS_INSTALL_DIR="%BUILD_DIR_BASE%\build_mmsolverlibs\install\maya%MAYA_VERSION%_windows64"
111+
SET MMSOLVERLIBS_INSTALL_DIR="%BUILD_MMSOLVERLIBS_DIR_BASE%\install\maya%MAYA_VERSION%_windows64"
102112
SET MMSOLVERLIBS_CMAKE_CONFIG_DIR="%MMSOLVERLIBS_INSTALL_DIR%\lib\cmake\mmsolverlibs_cpp"
103-
SET MMSOLVERLIBS_RUST_DIR="%BUILD_DIR_BASE%\build_mmsolverlibs\rust_windows64_maya%MAYA_VERSION%\%BUILD_TYPE_DIR%"
113+
SET MMSOLVERLIBS_RUST_DIR="%BUILD_MMSOLVERLIBS_DIR_BASE%\rust_windows64_maya%MAYA_VERSION%\%BUILD_TYPE_DIR%"
104114

105115
:: Paths for dependencies.
106-
SET EXTERNAL_BUILD_DIR=%BUILD_DIR_BASE%\build_opencolorio\cmake_win64_maya%MAYA_VERSION%_%BUILD_TYPE%\ext\dist
107-
SET OPENCOLORIO_INSTALL_DIR=%BUILD_DIR_BASE%\build_opencolorio\install\maya%MAYA_VERSION%_windows64\
108-
SET OPENCOLORIO_CMAKE_CONFIG_DIR=%OPENCOLORIO_INSTALL_DIR%\lib\cmake\OpenColorIO\
109-
SET OPENCOLORIO_CMAKE_FIND_MODULES_DIR=%PROJECT_ROOT%\external\working\maya%MAYA_VERSION%_windows64\%OPENCOLORIO_TARBALL_EXTRACTED_DIR_NAME%\share\cmake\modules
116+
SET EXTERNAL_OCIO_BUILD_DIR=%BUILD_OCIO_DIR_BASE%\cmake_win64_maya%MAYA_VERSION%_%BUILD_TYPE%\ext\dist
117+
SET OCIO_INSTALL_DIR=%BUILD_OCIO_DIR_BASE%\install\maya%MAYA_VERSION%_windows64\
118+
SET OCIO_CMAKE_CONFIG_DIR=%OCIO_INSTALL_DIR%\lib\cmake\OpenColorIO\
119+
SET OCIO_CMAKE_FIND_MODULES_DIR=%BUILD_OCIO_DIR_BASE%\source\maya%MAYA_VERSION%_windows64\%OPENCOLORIO_TARBALL_EXTRACTED_DIR_NAME%\share\cmake\modules
110120
:: Convert back-slashes to forward-slashes.
111121
:: https://stackoverflow.com/questions/23542453/change-backslash-to-forward-slash-in-windows-batch-file
112-
SET "OPENCOLORIO_CMAKE_FIND_MODULES_DIR=%OPENCOLORIO_CMAKE_FIND_MODULES_DIR:\=/%"
122+
SET "OCIO_CMAKE_FIND_MODULES_DIR=%OCIO_CMAKE_FIND_MODULES_DIR:\=/%"
113123

114-
SET expat_DIR=%EXTERNAL_BUILD_DIR%\%EXPAT_RELATIVE_CMAKE_DIR%
115-
SET expat_INCLUDE_DIR=%EXTERNAL_BUILD_DIR%\include\
116-
SET expat_LIBRARY=%EXTERNAL_BUILD_DIR%\%EXPAT_RELATIVE_LIB_PATH%
124+
SET expat_DIR=%EXTERNAL_OCIO_BUILD_DIR%\%EXPAT_RELATIVE_CMAKE_DIR%
125+
SET expat_INCLUDE_DIR=%EXTERNAL_OCIO_BUILD_DIR%\include\
126+
SET expat_LIBRARY=%EXTERNAL_OCIO_BUILD_DIR%\%EXPAT_RELATIVE_LIB_PATH%
117127

118-
SET pystring_INCLUDE_DIR=%EXTERNAL_BUILD_DIR%\include
119-
SET pystring_LIBRARY=%EXTERNAL_BUILD_DIR%\%PYSTRING_RELATIVE_LIB_PATH%
128+
SET pystring_INCLUDE_DIR=%EXTERNAL_OCIO_BUILD_DIR%\include
129+
SET pystring_LIBRARY=%EXTERNAL_OCIO_BUILD_DIR%\%PYSTRING_RELATIVE_LIB_PATH%
120130

121-
SET yaml_DIR=%EXTERNAL_BUILD_DIR%\%YAML_RELATIVE_CMAKE_DIR%
122-
SET yaml_LIBRARY=%EXTERNAL_BUILD_DIR%\%YAML_RELATIVE_LIB_PATH%
123-
SET yaml_INCLUDE_DIR=%EXTERNAL_BUILD_DIR%\include\
131+
SET yaml_DIR=%EXTERNAL_OCIO_BUILD_DIR%\%YAML_RELATIVE_CMAKE_DIR%
132+
SET yaml_LIBRARY=%EXTERNAL_OCIO_BUILD_DIR%\%YAML_RELATIVE_LIB_PATH%
133+
SET yaml_INCLUDE_DIR=%EXTERNAL_OCIO_BUILD_DIR%\include\
124134

125-
SET Imath_DIR=%EXTERNAL_BUILD_DIR%\lib\cmake\Imath
135+
SET Imath_DIR=%EXTERNAL_OCIO_BUILD_DIR%\lib\cmake\Imath
126136

127-
SET ZLIB_INCLUDE_DIR=%EXTERNAL_BUILD_DIR%\include\
128-
SET ZLIB_LIBRARY=%EXTERNAL_BUILD_DIR%\%ZLIB_RELATIVE_LIB_PATH%
137+
SET ZLIB_INCLUDE_DIR=%EXTERNAL_OCIO_BUILD_DIR%\include\
138+
SET ZLIB_LIBRARY=%EXTERNAL_OCIO_BUILD_DIR%\%ZLIB_RELATIVE_LIB_PATH%
129139

130-
SET minizip_DIR=%EXTERNAL_BUILD_DIR%\%MINIZIP_RELATIVE_CMAKE_DIR%
140+
SET minizip_DIR=%EXTERNAL_OCIO_BUILD_DIR%\%MINIZIP_RELATIVE_CMAKE_DIR%
131141

132142
:: MinGW is a common install for developers on Windows and
133143
:: if installed and used it will cause build conflicts and
@@ -187,7 +197,7 @@ CHDIR "%BUILD_DIR%"
187197
-DCMAKE_C_COMPILER=%CMAKE_C_COMPILER% ^
188198
-DCMAKE_CXX_COMPILER=%CMAKE_CXX_COMPILER% ^
189199
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON ^
190-
-DCMAKE_MODULE_PATH=%OPENCOLORIO_CMAKE_FIND_MODULES_DIR% ^
200+
-DCMAKE_MODULE_PATH=%OCIO_CMAKE_FIND_MODULES_DIR% ^
191201
-DCMAKE_VERBOSE_MAKEFILE=%MMSOLVER_BUILD_VERBOSE% ^
192202
-DBUILD_DATE_TIME="%BUILD_DATE_TIME%" ^
193203
-DGIT_BRANCH=%GIT_BRANCH% ^
@@ -213,7 +223,7 @@ CHDIR "%BUILD_DIR%"
213223
-DMAYA_VERSION=%MAYA_VERSION% ^
214224
-Dmmsolverlibs_rust_DIR=%MMSOLVERLIBS_RUST_DIR% ^
215225
-Dmmsolverlibs_cpp_DIR=%MMSOLVERLIBS_CMAKE_CONFIG_DIR% ^
216-
-DOpenColorIO_DIR=%OPENCOLORIO_CMAKE_CONFIG_DIR% ^
226+
-DOpenColorIO_DIR=%OCIO_CMAKE_CONFIG_DIR% ^
217227
-DOCIO_INSTALL_EXT_PACKAGES=NONE ^
218228
-DopenMVG_USE_AVX=1 ^
219229
-DopenMVG_USE_AVX2=1 ^

0 commit comments

Comments
 (0)