From abbc5c2159c44e1a019f28a868623cc666dd1c7f Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Fri, 29 Aug 2025 18:21:52 +0500 Subject: [PATCH] run-cmake.bat - use opencollada install dir instead of providing include/library dirs explicitly --- win/run-cmake.bat | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/win/run-cmake.bat b/win/run-cmake.bat index c1ad00beef..83d142b469 100755 --- a/win/run-cmake.bat +++ b/win/run-cmake.bat @@ -87,8 +87,7 @@ set BOOST_ROOT=%DEPS_DIR%\boost_%BOOST_VER% set BOOST_LIBRARYDIR=%BOOST_ROOT%\stage\%GEN_SHORTHAND%\lib if not defined OCC_INCLUDE_DIR set OCC_INCLUDE_DIR=%INSTALL_DIR%\oce\include\oce if not defined OCC_LIBRARY_DIR set OCC_LIBRARY_DIR=%INSTALL_DIR%\oce\Win%ARCH_BITS%\lib -set OPENCOLLADA_INCLUDE_DIR=%INSTALL_DIR%\OpenCOLLADA\include\opencollada -set OPENCOLLADA_LIBRARY_DIR=%INSTALL_DIR%\OpenCOLLADA\lib\opencollada +set OPENCOLLADA_INSTALL_DIR=%INSTALL_DIR%\OpenCOLLADA set LIBXML2_INCLUDE_DIR=%DEPS_DIR%\OpenCOLLADA\Externals\LibXML\include set LIBXML2_LIBRARIES=%INSTALL_DIR%\OpenCOLLADA\lib\opencollada\xml.lib set HDF5_INSTALL_DIR=%INSTALL_DIR%\HDF5-%HDF5_VERSION%-win%ARCH_BITS% @@ -126,8 +125,7 @@ echo BOOST_ROOT = %BOOST_ROOT% echo BOOST_LIBRARYDIR = %BOOST_LIBRARYDIR% echo OCC_INCLUDE_DIR = %OCC_INCLUDE_DIR% echo OCC_LIBRARY_DIR = %OCC_LIBRARY_DIR% -echo OPENCOLLADA_INCLUDE_DIR = %OPENCOLLADA_INCLUDE_DIR% -echo OPENCOLLADA_LIBRARY_DIR = %OPENCOLLADA_LIBRARY_DIR% +echo OPENCOLLADA_INSTALL_DIR = %OPENCOLLADA_INSTALL_DIR% echo LIBXML2_INCLUDE_DIR = %LIBXML2_INCLUDE_DIR% echo LIBXML2_LIBRARIES = %LIBXML2_LIBRARIES% echo HDF5_INSTALL_DIR = %HDF5_INSTALL_DIR% @@ -161,12 +159,12 @@ call cecho.cmd 0 13 "Running CMake for %PROJECT_NAME%." IF NOT "%VS_TOOLSET_HOST%"=="" ( cmake.exe %CMAKELISTS_DIR% -G %GENERATOR% -A %VS_PLATFORM% -T %VS_TOOLSET_HOST% ^ -DCMAKE_INSTALL_PREFIX="%CMAKE_INSTALL_PREFIX%" -DBoost_NO_BOOST_CMAKE=ON ^ - -DCMAKE_PREFIX_PATH="%HDF5_INSTALL_DIR%" ^ + -DCMAKE_PREFIX_PATH="%HDF5_INSTALL_DIR%;%OPENCOLLADA_INSTALL_DIR%" ^ -DADD_COMMIT_SHA=%ADD_COMMIT_SHA% %ARGUMENTS% ) ELSE ( cmake.exe %CMAKELISTS_DIR% -G %GENERATOR% -A %VS_PLATFORM% ^ -DCMAKE_INSTALL_PREFIX="%CMAKE_INSTALL_PREFIX%" -DBoost_NO_BOOST_CMAKE=ON ^ - -DCMAKE_PREFIX_PATH="%HDF5_INSTALL_DIR%" ^ + -DCMAKE_PREFIX_PATH="%HDF5_INSTALL_DIR%;%OPENCOLLADA_INSTALL_DIR%" ^ -DADD_COMMIT_SHA=%ADD_COMMIT_SHA% %ARGUMENTS% )