Attempt to fix debug symbols on windows builds

Author: RyeMutt

build-cmd.sh

@@ -30,9 +30,11 @@ source_environment_tempfile="$stage/source_environment.sh"
 "$autobuild" source_environment > "$source_environment_tempfile"
 . "$source_environment_tempfile"
 
-# remove_cxxstd
+# remove_cxxstd apply_patch
 source "$(dirname "$AUTOBUILD_VARIABLES_FILE")/functions"
 
+apply_patch "$top/patches/update-cmake-version-compat.patch" "$MINIZLIB_SOURCE_DIR"
+
 # CMake configuration options for all platforms
 config=( \
     -DBUILD_SHARED_LIBS=OFF \
@@ -64,8 +66,8 @@ pushd "$MINIZLIB_SOURCE_DIR"
                 opts="$(replace_switch /Zi /Z7 $LL_BUILD_DEBUG)"
                 plainopts="$(remove_switch /GR $(remove_cxxstd $opts))"
 
-                cmake $(cygpath -m ${top}/${MINIZLIB_SOURCE_DIR}) -G "Ninja Multi-Config" \
-                    -DCMAKE_BUILD_TYPE="Debug" \
+                cmake $(cygpath -m ${top}/${MINIZLIB_SOURCE_DIR}) -G "$AUTOBUILD_WIN_CMAKE_GEN" -A "$AUTOBUILD_WIN_VSPLATFORM" \
+                    -DCMAKE_CONFIGURATION_TYPES="Debug" \
                     -DCMAKE_C_FLAGS:STRING="$plainopts" \
                     -DCMAKE_CXX_FLAGS:STRING="$opts" \
                     -DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT="Embedded" \
@@ -90,8 +92,8 @@ pushd "$MINIZLIB_SOURCE_DIR"
                 opts="$(replace_switch /Zi /Z7 $LL_BUILD_RELEASE)"
                 plainopts="$(remove_switch /GR $(remove_cxxstd $opts))"
 
-                cmake $(cygpath -m ${top}/${MINIZLIB_SOURCE_DIR}) -G "Ninja Multi-Config" \
-                    -DCMAKE_BUILD_TYPE="Release" \
+                cmake $(cygpath -m ${top}/${MINIZLIB_SOURCE_DIR}) -G "$AUTOBUILD_WIN_CMAKE_GEN" -A "$AUTOBUILD_WIN_VSPLATFORM" \
+                    -DCMAKE_CONFIGURATION_TYPES="Release" \
                     -DCMAKE_C_FLAGS:STRING="$plainopts" \
                     -DCMAKE_CXX_FLAGS:STRING="$opts" \
                     -DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT="Embedded" \
@@ -129,7 +131,8 @@ pushd "$MINIZLIB_SOURCE_DIR"
                 pushd "build_$arch"
                     CFLAGS="$cc_opts" \
                     LDFLAGS="$ld_opts" \
-                    cmake ${top}/${MINIZLIB_SOURCE_DIR} -G "Ninja Multi-Config" \
+                    cmake ${top}/${MINIZLIB_SOURCE_DIR} -G "Xcode" \
+                        -DCMAKE_CONFIGURATION_TYPES="Release" \
                         -DCMAKE_C_FLAGS:STRING="$cc_opts" \
                         -DCMAKE_CXX_FLAGS:STRING="$opts" \
                         "${config[@]}" \

patches/update-cmake-version-compat.patch

@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c684e3e..3439270 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,7 +5,7 @@
+ # Copyright (C) 2016 Matthias Schmieder
+ #   schmieder.matthias@gmail.com
+ 
+-cmake_minimum_required(VERSION 3.13)
++cmake_minimum_required(VERSION 3.13...3.31)
+ 
+ # Library version
+ set(VERSION "4.0.8")