diff --git a/nix/build-all.py b/nix/build-all.py index 0dfc64fe5c..03c40d2541 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -1106,7 +1106,6 @@ cmake_args = [ "-DUSE_MMAP=OFF", "-DBUILD_EXAMPLES=OFF", "-DBUILD_SHARED_LIBS=" + OFF_ON[not BUILD_STATIC], - f"-DBOOST_ROOT={DEPS_DIR}/install/boost-{BOOST_VERSION}", "-DGLTF_SUPPORT=ON", f"-DJSON_INCLUDE_DIR={DEPS_DIR}/install/json", f"-DEIGEN_DIR={DEPS_DIR}/install/eigen-3.3.9", @@ -1115,7 +1114,9 @@ cmake_args = [ "-DVERSION_OVERRIDE=" + ("On" if ADD_COMMIT_SHA else "Off"), ] """Default CMake args to use for all CMake configs.""" -cmake_args_prefix_path: list[str] = [] +cmake_args_prefix_path: list[str] = [ + f"{DEPS_DIR}/install/boost-{BOOST_VERSION}", +] def get_cmake_args_prefix_path(additional_paths: Sequence[str] = ()) -> list[str]: diff --git a/win/run-cmake.bat b/win/run-cmake.bat index 6c18155a7a..bb0ffb21bf 100755 --- a/win/run-cmake.bat +++ b/win/run-cmake.bat @@ -162,6 +162,7 @@ echo "Running CMake for %PROJECT_NAME%." set CMAKE_PREFIX_PATH=%HDF5_INSTALL_DIR%;%OPENCOLLADA_INSTALL_DIR%;%SWIG_INSTALL_DIR% set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%ROCKSDB_INSTALL_DIR%;%ZSTD_INSTALL_DIR% +set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%BOOST_ROOT% IF NOT "%VS_TOOLSET_HOST%"=="" ( cmake.exe %CMAKELISTS_DIR% -G %GENERATOR% -A %VS_PLATFORM% -T %VS_TOOLSET_HOST% ^