diff --git a/nix/build-all.py b/nix/build-all.py index a9a835163c..ef7ed2837e 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -70,6 +70,7 @@ logger.addHandler(ch) PROJECT_NAME = "IfcOpenShell" USE_CURRENT_PYTHON_VERSION = os.getenv("USE_CURRENT_PYTHON_VERSION") +ADD_COMMIT_SHA = os.getenv("ADD_COMMIT_SHA") PYTHON_VERSIONS = ["3.6.14", "3.7.12", "3.8.12", "3.9.7", "3.10.0"] JSON_VERSION = "v3.6.1" @@ -691,6 +692,7 @@ cmake_args = [ "-DGLTF_SUPPORT=" "ON", "-DJSON_INCLUDE_DIR=" f"{DEPS_DIR}/install/json", "-DBoost_NO_BOOST_CMAKE=" "On", + "-DADD_COMMIT_SHA=" ("On" if ADD_COMMIT_SHA else "Off") ] if "cgal" in targets: diff --git a/win/run-cmake.bat b/win/run-cmake.bat index b18b83acf4..714919ae49 100755 --- a/win/run-cmake.bat +++ b/win/run-cmake.bat @@ -101,6 +101,7 @@ set PYTHON_EXECUTABLE=%PYTHONHOME%\python.exe set SWIG_DIR=%INSTALL_DIR%\swigwin set PATH=%PATH%;%SWIG_DIR%;%PYTHONHOME% set JSON_INCLUDE_DIR=%INSTALL_DIR%\json +if not defined ADD_COMMIT_SHA set ADD_COMMIT_SHA=Off set CGAL_INCLUDE_DIR=%INSTALL_DIR%\cgal\include :: set CGAL_LIBRARY_DIR=%INSTALL_DIR%\cgal\lib @@ -150,9 +151,9 @@ if not (%1)==() if exist CMakeCache.txt. del /Q CMakeCache.txt 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 %ARGUMENTS% + cmake.exe %CMAKELISTS_DIR% -G %GENERATOR% -A %VS_PLATFORM% -T %VS_TOOLSET_HOST% -DCMAKE_INSTALL_PREFIX="%CMAKE_INSTALL_PREFIX%" -DBoost_NO_BOOST_CMAKE=On -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 %ARGUMENTS% + cmake.exe %CMAKELISTS_DIR% -G %GENERATOR% -A %VS_PLATFORM% -DCMAKE_INSTALL_PREFIX="%CMAKE_INSTALL_PREFIX%" -DBoost_NO_BOOST_CMAKE=On -DADD_COMMIT_SHA=%ADD_COMMIT_SHA% %ARGUMENTS% ) IF NOT %ERRORLEVEL%==0 GOTO :Error