diff --git a/build_release_macos.sh b/build_release_macos.sh index db03cb4ecd..728cb8e757 100755 --- a/build_release_macos.sh +++ b/build_release_macos.sh @@ -104,8 +104,8 @@ fi CMAKE_VERSION=$(cmake --version | head -1 | sed 's/[^0-9]*\([0-9]*\).*/\1/') if [ "$CMAKE_VERSION" -ge 4 ] 2>/dev/null; then - export CMAKE_POLICY_VERSION_MINIMUM=3.5 - export CMAKE_POLICY_COMPAT="-DCMAKE_POLICY_VERSION_MINIMUM=3.5" + export CMAKE_POLICY_VERSION_MINIMUM=3.10 + export CMAKE_POLICY_COMPAT="-DCMAKE_POLICY_VERSION_MINIMUM=3.10" echo "Detected CMake 4.x, adding compatibility flag (env + cmake arg)" else export CMAKE_POLICY_COMPAT="" diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index aa64ad4dc9..eda0c67e94 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -1,5 +1,5 @@ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "4.0") - set(CMAKE_POLICY_VERSION_MINIMUM 3.5 CACHE STRING "" FORCE) + set(CMAKE_POLICY_VERSION_MINIMUM 3.10 CACHE STRING "" FORCE) endif() # @@ -24,7 +24,7 @@ endif() # therefore, unfortunately, the installation cannot be copied/moved elsewhere without re-installing wxWidgets. # -cmake_minimum_required(VERSION 3.2) +cmake_minimum_required(VERSION 3.10) if (APPLE) # if CMAKE_OSX_DEPLOYMENT_TARGET is not set, set it to 12.0 (the lowest Xcode 27 accepts) if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) @@ -224,7 +224,7 @@ if (NOT IS_CROSS_COMPILE OR NOT APPLE) ${_source_dir_arg} ${_gen} CMAKE_ARGS - -DCMAKE_POLICY_VERSION_MINIMUM=3.5 + -DCMAKE_POLICY_VERSION_MINIMUM=3.10 -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR} -DCMAKE_MODULE_PATH:STRING=${PROJECT_SOURCE_DIR}/../cmake/modules -DCMAKE_PREFIX_PATH:STRING=${DESTDIR} @@ -279,7 +279,7 @@ else() ${_source_dir_arg} ${_gen} CMAKE_ARGS - -DCMAKE_POLICY_VERSION_MINIMUM=3.5 + -DCMAKE_POLICY_VERSION_MINIMUM=3.10 -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR} -DCMAKE_PREFIX_PATH:STRING=${DESTDIR} -DCMAKE_IGNORE_PREFIX_PATH:STRING=${CMAKE_IGNORE_PREFIX_PATH} diff --git a/scripts/Dockerfile.deps-assimp b/scripts/Dockerfile.deps-assimp index 40566885c0..505eb3e4f5 100644 --- a/scripts/Dockerfile.deps-assimp +++ b/scripts/Dockerfile.deps-assimp @@ -46,7 +46,7 @@ RUN set -eux; \ tar -xzf /tmp/assimp.tar.gz -C /tmp/assimp-src --strip-components=1; \ DESTDIR=/OrcaSlicer/deps/build/destdir/usr/local; \ cmake -S /tmp/assimp-src -B /tmp/assimp-build -G Ninja \ - -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="$DESTDIR" \ -DCMAKE_PREFIX_PATH="$DESTDIR" \