Updates to Windows CI build

Author: zayenz

.github/workflows/build.yml

@@ -118,3 +118,44 @@ jobs:
     - name: Build test binary
       shell: pwsh
       run: cmake --build "${{ github.workspace }}\\build" --config ${{ env.BUILD_TYPE }} --target gecode-test
+
+  build-autoconf-windows:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Setup MSYS2
+      uses: msys2/setup-msys2@v2
+      with:
+        msystem: UCRT64
+        update: true
+        install: >-
+          autoconf
+          automake
+          bison
+          flex
+          gcc
+          make
+          m4
+          libtool
+          perl
+          mingw-w64-ucrt-x86_64-gcc
+          mingw-w64-ucrt-x86_64-gmp
+          mingw-w64-ucrt-x86_64-mpfr
+
+    - name: Stabilize generated configure script timestamp
+      shell: msys2 {0}
+      run: touch configure
+
+    - name: Configure
+      shell: msys2 {0}
+      run: ./configure --disable-qt --disable-gist
+
+    - name: Build
+      shell: msys2 {0}
+      run: make test -j4
+
+    - name: Check
+      shell: msys2 {0}
+      run: make check

CMakeLists.txt

@@ -403,40 +403,13 @@ foreach(i RANGE ${length})
   set(CONFIG_OUT "${CONFIG_OUT}${line}")
 endforeach()
 
-set(GECODE_BUILD_DEFINES "/* Disable autolink because all dependencies are handled by CMake. */\n")
-foreach(component SUPPORT KERNEL)
-  string(APPEND GECODE_BUILD_DEFINES "#define GECODE_BUILD_${component}\n")
-endforeach()
-if(GECODE_ENABLE_SEARCH)
-  string(APPEND GECODE_BUILD_DEFINES "#define GECODE_BUILD_SEARCH\n")
-endif()
-if(GECODE_ENABLE_INT_VARS)
-  string(APPEND GECODE_BUILD_DEFINES "#define GECODE_BUILD_INT\n")
-endif()
-if(GECODE_ENABLE_SET_VARS)
-  string(APPEND GECODE_BUILD_DEFINES "#define GECODE_BUILD_SET\n")
-endif()
-if(GECODE_ENABLE_FLOAT_VARS)
-  string(APPEND GECODE_BUILD_DEFINES "#define GECODE_BUILD_FLOAT\n")
-endif()
-if(GECODE_ENABLE_MINIMODEL)
-  string(APPEND GECODE_BUILD_DEFINES "#define GECODE_BUILD_MINIMODEL\n")
-endif()
-if(GECODE_ENABLE_FLATZINC)
-  string(APPEND GECODE_BUILD_DEFINES "#define GECODE_BUILD_FLATZINC\n")
-endif()
-if(GECODE_ENABLE_DRIVER)
-  string(APPEND GECODE_BUILD_DEFINES "#define GECODE_BUILD_DRIVER\n")
-endif()
-if(GECODE_BUILD_GIST_TARGET)
-  string(APPEND GECODE_BUILD_DEFINES "#define GECODE_BUILD_GIST\n")
-endif()
-
 file(WRITE ${GECODE_BINARY_DIR}/gecode/support/config.hpp
 "/* gecode/support/config.hpp.  Generated from config.hpp.in by configure.  */
 /* gecode/support/config.hpp.in.  Generated from configure.ac by autoheader.  */
 
-${GECODE_BUILD_DEFINES}
+/* Disable MSVC pragma-based auto-linking: CMake wires dependencies explicitly. */
+#define GECODE_NO_AUTOLINK 1
+
 ${CONFIG_OUT}")
 
 # ---------------------------------------------------------------------------
@@ -567,6 +540,7 @@ function(add_gecode_component_library lib)
 
   if(GECODE_BUILD_SHARED)
     add_library(gecode${lib}_shared SHARED ${sources})
+    target_compile_definitions(gecode${lib}_shared PRIVATE GECODE_BUILD_${libupper})
     target_include_directories(gecode${lib}_shared
       PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
@@ -585,6 +559,7 @@ function(add_gecode_component_library lib)
 
   if(GECODE_BUILD_STATIC)
     add_library(gecode${lib}_static STATIC ${sources})
+    target_compile_definitions(gecode${lib}_static PRIVATE GECODE_BUILD_${libupper})
     target_include_directories(gecode${lib}_static
       PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>

gecode/support/auto-link.hpp

@@ -36,7 +36,7 @@
  *
  */
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(GECODE_NO_AUTOLINK)
 
 #if defined(_M_IX86)
 #define GECODE_DLL_PLATFORM "x86"