From cd87217f4e4cc13a5613769f458aa7186b1fa0a5 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Mon, 15 Dec 2025 17:33:15 +0500 Subject: [PATCH] build scripts - don't provide cxx-std-17 As it's automatically set by the cmake script. --- .github/workflows/ci-ifcopenshell-docker.yml | 1 - .github/workflows/ci.yml | 1 - .github/workflows/release.yml | 1 - conda/build.bat | 5 ++--- conda/build.sh | 1 - nix/build-all.py | 1 - 6 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-ifcopenshell-docker.yml b/.github/workflows/ci-ifcopenshell-docker.yml index 5d79e5fbb1..52764cd4b6 100644 --- a/.github/workflows/ci-ifcopenshell-docker.yml +++ b/.github/workflows/ci-ifcopenshell-docker.yml @@ -44,7 +44,6 @@ jobs: cmake \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_PREFIX=$PWD/install/ \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PREFIX_PATH=/usr \ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6fcaf11951..ad00406ed8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -172,7 +172,6 @@ jobs: mkdir build && cd build cmake \ - -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PREFIX_PATH=/usr \ -DCMAKE_SYSTEM_PREFIX_PATH=/usr \ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8050c10e87..b5cbb4f28c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,7 +46,6 @@ jobs: mkdir build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=$PWD/install/ \ - -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PREFIX_PATH=/usr \ -DCMAKE_SYSTEM_PREFIX_PATH=/usr \ diff --git a/conda/build.bat b/conda/build.bat index fe8cef01c1..242bc7d683 100644 --- a/conda/build.bat +++ b/conda/build.bat @@ -9,7 +9,6 @@ set LIBXML2="%LIBRARY_PREFIX%/lib/libxml2.lib" cmake -G "Ninja" ^ -D SCHEMA_VERSIONS="2x3;4;4x1;4x3_add2" ^ -D CMAKE_BUILD_TYPE:STRING=Release ^ - -D CMAKE_CXX_STANDARD=17 ^ -D CMAKE_INSTALL_PREFIX:FILEPATH="%LIBRARY_PREFIX%" ^ -D CMAKE_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^ -D CMAKE_SYSTEM_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^ @@ -43,7 +42,7 @@ cmake -G "Ninja" ^ -D Boost_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%\include" ^ -D Boost_USE_STATIC_LIBS:BOOL=OFF ^ ../cmake - + if errorlevel 1 exit 1 ninja install -j 1 @@ -52,4 +51,4 @@ if errorlevel 1 exit 1 python %RECIPE_DIR%/update_version_init.py %PKG_VERSION% %SP_DIR%/ifcopenshell/__init__.py -if errorlevel 1 exit 1 \ No newline at end of file +if errorlevel 1 exit 1 diff --git a/conda/build.sh b/conda/build.sh index 571b6959f8..132bcf2be9 100644 --- a/conda/build.sh +++ b/conda/build.sh @@ -16,7 +16,6 @@ cmake ${CMAKE_ARGS} -G Ninja \ -DSCHEMA_VERSIONS="2x3;4;4x1;4x3_add2" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ - -DCMAKE_CXX_STANDARD=17 \ ${CMAKE_PLATFORM_FLAGS[@]} \ -DCMAKE_PREFIX_PATH=$PREFIX \ -DCMAKE_SYSTEM_PREFIX_PATH=$PREFIX \ diff --git a/nix/build-all.py b/nix/build-all.py index b548b874c8..3bd12885c3 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -1330,7 +1330,6 @@ os.makedirs(executables_dir, exist_ok=True) cmake_args = [ - "-DCMAKE_CXX_STANDARD=17", "-DUSE_MMAP=OFF", "-DBUILD_EXAMPLES=OFF", "-DBUILD_SHARED_LIBS=" + OFF_ON[not BUILD_STATIC],