mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-08-31 08:56:34 +00:00
Add qt6 to win build scripts using an 3rd party install script
This commit is contained in:
+25
-18
@@ -123,10 +123,11 @@ set MPFR_INSTALL_DIR=%INSTALL_DIR%\mpfr
|
||||
:: We don't install Eigen currently,
|
||||
:: so there's no Eigen3config.cmake and therefore we provide path explicitly.
|
||||
set EIGEN_DIR=%INSTALL_DIR%\Eigen
|
||||
set TBB_INSTALL_DIR=%INSTALL_DIR%\tbb
|
||||
set USD_INSTALL_DIR=%INSTALL_DIR%\usd
|
||||
set ROCKSDB_INSTALL_DIR=%INSTALL_DIR%\rocksdb
|
||||
set ZSTD_INSTALL_DIR=%INSTALL_DIR%\zstd
|
||||
set TBB_INSTALL_DIR=%INSTALL_DIR%\tbb
|
||||
set USD_INSTALL_DIR=%INSTALL_DIR%\usd
|
||||
set ROCKSDB_INSTALL_DIR=%INSTALL_DIR%\rocksdb
|
||||
set ZSTD_INSTALL_DIR=%INSTALL_DIR%\zstd
|
||||
if not defined QT_DIR if defined QT6_INSTALL_DIR set QT_DIR=%QT6_INSTALL_DIR%
|
||||
|
||||
echo.
|
||||
call cecho.cmd 0 10 "Script configuration:"
|
||||
@@ -158,12 +159,13 @@ echo GMP_INSTALL_DIR = %GMP_INSTALL_DIR%
|
||||
echo MPFR_INSTALL_DIR = %MPFR_INSTALL_DIR%
|
||||
echo EIGEN_DIR = %EIGEN_DIR%
|
||||
echo TBB_INSTALL_DIR = %TBB_INSTALL_DIR%
|
||||
echo USD_INSTALL_DIR = %USD_INSTALL_DIR%
|
||||
echo ROCKSDB_INSTALL_DIR = %ROCKSDB_INSTALL_DIR%
|
||||
echo ZSTD_INSTALL_DIR = %ZSTD_INSTALL_DIR%
|
||||
echo CCACHE_INSTALL_DIR = %CCACHE_INSTALL_DIR%
|
||||
echo.
|
||||
echo CMAKE_INSTALL_PREFIX = %CMAKE_INSTALL_PREFIX%
|
||||
echo USD_INSTALL_DIR = %USD_INSTALL_DIR%
|
||||
echo ROCKSDB_INSTALL_DIR = %ROCKSDB_INSTALL_DIR%
|
||||
echo ZSTD_INSTALL_DIR = %ZSTD_INSTALL_DIR%
|
||||
echo QT_DIR = %QT_DIR%
|
||||
echo CCACHE_INSTALL_DIR = %CCACHE_INSTALL_DIR%
|
||||
echo.
|
||||
echo CMAKE_INSTALL_PREFIX = %CMAKE_INSTALL_PREFIX%
|
||||
echo.
|
||||
|
||||
set CMAKELISTS_DIR=..\cmake
|
||||
@@ -173,10 +175,14 @@ 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_INSTALL_DIR%;%CCACHE_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%;%GMP_INSTALL_DIR%;%MPFR_INSTALL_DIR%
|
||||
set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%BOOST_INSTALL_DIR%;%CCACHE_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%;%GMP_INSTALL_DIR%;%MPFR_INSTALL_DIR%
|
||||
if defined QT_DIR set CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%QT_DIR%
|
||||
|
||||
set QT_DIR_OPTION=
|
||||
if defined QT_DIR set QT_DIR_OPTION=-DQT_DIR="%QT_DIR%"
|
||||
|
||||
:: Not fully supported - not available from install-ifcopenshell
|
||||
:: and some logs are still showing Visual Studio generators.
|
||||
@@ -195,10 +201,11 @@ IF NOT "%VS_TOOLSET_HOST%"=="" (
|
||||
|
||||
cmake.exe %CMAKELISTS_DIR% -G %GENERATOR% %ARCH_OPTION% %VS_TOOLSET_OPTION% ^
|
||||
-DCMAKE_INSTALL_PREFIX="%CMAKE_INSTALL_PREFIX%" ^
|
||||
-DWITH_ROCKSDB=On -DWITH_ZSTD=On ^
|
||||
-DCMAKE_PREFIX_PATH="%CMAKE_PREFIX_PATH%" ^
|
||||
-DADD_COMMIT_SHA=%ADD_COMMIT_SHA% -DVERSION_OVERRIDE=%VERSION_OVERRIDE% ^
|
||||
%ARGUMENTS%
|
||||
-DWITH_ROCKSDB=On -DWITH_ZSTD=On ^
|
||||
-DCMAKE_PREFIX_PATH="%CMAKE_PREFIX_PATH%" ^
|
||||
%QT_DIR_OPTION% ^
|
||||
-DADD_COMMIT_SHA=%ADD_COMMIT_SHA% -DVERSION_OVERRIDE=%VERSION_OVERRIDE% ^
|
||||
%ARGUMENTS%
|
||||
|
||||
IF NOT %ERRORLEVEL%==0 GOTO :Error
|
||||
|
||||
|
||||
Reference in New Issue
Block a user