Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-24 04:47:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

run-cmake: wire manifold

Browse Source 
Renamed variable to `MANIFOLD_INSTALL_PATH` to avoid relying on env variables for manifold package discovery in cmake.
This commit is contained in:
Andrej730
2026-09-09 12:07:33 +05:00
parent e9a547dd5e
commit fe5b826ec1
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/build-deps.cmd
+1 -1
View File
@@ -869,7 +869,7 @@ set DEPENDENCY_INSTALL_DIR=%INSTALL_DIR%\manifold-%MANIFOLD_VERSION%
set NEXT_DEPENDENCY_LABEL=Successful set NEXT_DEPENDENCY_LABEL=Successful
:: TODO: test whether manifold links the debug CRT for Debug builds and needs separate :: TODO: test whether manifold links the debug CRT for Debug builds and needs separate
:: Release/Debug install dirs instead of sharing one. :: Release/Debug install dirs instead of sharing one.
echo MANIFOLD_ROOT=%DEPENDENCY_INSTALL_DIR%>>"%~dp0\%BUILD_DEPS_CACHE_PATH%" echo MANIFOLD_INSTALL_PATH=%DEPENDENCY_INSTALL_DIR%>>"%~dp0\%BUILD_DEPS_CACHE_PATH%"
IF EXIST "%DEPENDENCY_INSTALL_DIR%" ( IF EXIST "%DEPENDENCY_INSTALL_DIR%" (
echo Found existing "%DEPENDENCY_INSTALL_DIR%", skipping echo Found existing "%DEPENDENCY_INSTALL_DIR%", skipping
win/run-cmake.bat
+7
View File
@@ -158,6 +158,7 @@ echo TBB_INSTALL_DIR = %TBB_INSTALL_DIR%
echo USD_INSTALL_DIR = %USD_INSTALL_DIR% echo USD_INSTALL_DIR = %USD_INSTALL_DIR%
echo ROCKSDB_INSTALL_DIR = %ROCKSDB_INSTALL_DIR% echo ROCKSDB_INSTALL_DIR = %ROCKSDB_INSTALL_DIR%
echo ZSTD_INSTALL_DIR = %ZSTD_INSTALL_DIR% echo ZSTD_INSTALL_DIR = %ZSTD_INSTALL_DIR%
echo MANIFOLD_INSTALL_PATH = %MANIFOLD_INSTALL_PATH%
echo QT_DIR = %QT_DIR% echo QT_DIR = %QT_DIR%
echo QT_HOST_PATH = %QT_HOST_PATH% echo QT_HOST_PATH = %QT_HOST_PATH%
echo CCACHE_INSTALL_DIR = %CCACHE_INSTALL_DIR% echo CCACHE_INSTALL_DIR = %CCACHE_INSTALL_DIR%
@@ -176,12 +177,17 @@ set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%BOOST_INSTALL_DIR%;%CCACHE_INSTALL_DI
set CMake_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%USD_INSTALL_DIR%;%TBB_INSTALL_DIR% set CMake_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%USD_INSTALL_DIR%;%TBB_INSTALL_DIR%
set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%OCC_INSTALL_DIR%;%CGAL_INSTALL_DIR% set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%OCC_INSTALL_DIR%;%CGAL_INSTALL_DIR%
set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%GMP_INSTALL_DIR%;%MPFR_INSTALL_DIR% set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%GMP_INSTALL_DIR%;%MPFR_INSTALL_DIR%
:: TODO: drop this TRANSITION check once everyone has re-run build-deps.cmd with manifold support.
if defined MANIFOLD_INSTALL_PATH set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%MANIFOLD_INSTALL_PATH%
if defined QT_DIR set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%QT_DIR% if defined QT_DIR set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%QT_DIR%
set QT_DIR_OPTION= set QT_DIR_OPTION=
if defined QT_DIR set QT_DIR_OPTION=-DQT_DIR="%QT_DIR%" if defined QT_DIR set QT_DIR_OPTION=-DQT_DIR="%QT_DIR%"
set QT_HOST_PATH_OPTION= set QT_HOST_PATH_OPTION=
if defined QT_HOST_PATH set QT_HOST_PATH_OPTION=-DQT_HOST_PATH="%QT_HOST_PATH%" if defined QT_HOST_PATH set QT_HOST_PATH_OPTION=-DQT_HOST_PATH="%QT_HOST_PATH%"
:: TODO: drop this TRANSITION check once everyone has re-run build-deps.cmd with manifold support.
set WITH_MANIFOLD_OPTION=
if defined MANIFOLD_INSTALL_PATH set WITH_MANIFOLD_OPTION=-DWITH_MANIFOLD=ON
:: Not fully supported - not available from install-ifcopenshell :: Not fully supported - not available from install-ifcopenshell
:: and some logs are still showing Visual Studio generators. :: and some logs are still showing Visual Studio generators.
@@ -200,6 +206,7 @@ cmake.exe %CMAKELISTS_DIR% -G %GENERATOR% %ARCH_OPTION% ^
-DCMAKE_PREFIX_PATH="%CMAKE_PREFIX_PATH%" ^ -DCMAKE_PREFIX_PATH="%CMAKE_PREFIX_PATH%" ^
%QT_DIR_OPTION% ^ %QT_DIR_OPTION% ^
%QT_HOST_PATH_OPTION% ^ %QT_HOST_PATH_OPTION% ^
%WITH_MANIFOLD_OPTION% ^
-DADD_COMMIT_SHA=%ADD_COMMIT_SHA% -DVERSION_OVERRIDE=%VERSION_OVERRIDE% ^ -DADD_COMMIT_SHA=%ADD_COMMIT_SHA% -DVERSION_OVERRIDE=%VERSION_OVERRIDE% ^
%ARGUMENTS% %ARGUMENTS%