@@ -395,7 +395,6 @@ set DEPENDENCY_INSTALL_DIR=%DEPENDENCY_DIR%\stage\%GEN_SHORTHAND%
395395echo BOOST_INSTALL_DIR=%DEPENDENCY_INSTALL_DIR% >> " %~dp0 \%BUILD_DEPS_CACHE_PATH% "
396396:: Needed for CGAL build.
397397set BOOST_ROOT = %DEPENDENCY_DIR%
398- set BOOST_LIBRARYDIR = %DEPENDENCY_DIR% \stage\%GEN_SHORTHAND% \lib
399398:: NOTE Also zip download exists, if encountering problems with 7z for some reason.
400399set ZIP_EXT = 7z
401400set BOOST_ZIP = boost-%BOOST_VERSION% -b2-nodocs.%ZIP_EXT%
@@ -653,8 +652,7 @@ call :RunCMake -DCMAKE_INSTALL_PREFIX="%INSTALL_DIR%\cgal" ^
653652 -DGMP_LIBRARIES=" %INSTALL_DIR% \mpir\mpir.lib" ^
654653 -DMPFR_INCLUDE_DIR=" %INSTALL_DIR% \mpfr" ^
655654 -DMPFR_LIBRARIES=" %INSTALL_DIR% \mpfr\mpfr.lib" ^
656- -DCGAL_HEADER_ONLY=On ^
657- -DBOOST_LIBRARYDIR=" %BOOST_LIBRARYDIR% "
655+ -DCGAL_HEADER_ONLY=On
658656IF NOT %ERRORLEVEL% == 0 GOTO :Error
659657call :BuildSolution " %DEPENDENCY_DIR% \%BUILD_DIR% \CGAL.sln" %BUILD_CFG%
660658IF NOT %ERRORLEVEL% == 0 GOTO :Error
@@ -771,7 +769,6 @@ call :MarkInstallation
771769:: -DPXR_BUILD_USD_TOOLS=FALSE ^
772770:: -DPXR_BUILD_TESTS=FALSE ^
773771:: -DBUILD_SHARED_LIBS=Off ^
774- :: -DBOOST_LIBRARYDIR="%DEPS_DIR%\boost_%BOOST_VER%\stage\vs%VS_VER%-%VS_PLATFORM%\lib"
775772:: IF NOT %ERRORLEVEL%==0 GOTO :Error
776773:: call :BuildSolution "%DEPENDENCY_DIR%\%BUILD_DIR%\USD.sln" %BUILD_CFG%
777774:: IF NOT %ERRORLEVEL%==0 GOTO :Error
0 commit comments