MinGW

modelica-3rdparty · Jan 4, 2025 · cfa489c · cfa489c
1 parent e085947
commit cfa489c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/.github/workflows/checkCI.yml b/.github/workflows/checkCI.yml
@@ -18,18 +18,10 @@ jobs:
       fail-fast: false
       matrix:
         toolchain:
-          - linux-gcc
-          - windows-msvc
           - windows-mingw
         configuration:
           - Release
         include:
-          - toolchain: linux-gcc
-            os: ubuntu-latest
-            compiler: gcc
-          - toolchain: windows-msvc
-            os: windows-latest
-            compiler: msvc
           - toolchain: windows-mingw
             os: windows-latest
             compiler: mingw
@@ -38,12 +30,20 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 5
+      - name: Install HDF5
+        if: matrix.compiler == 'mingw'
+        shell: pwsh
+        run: |
+          $env:PATH="$env:PATH;C:\msys64\mingw64\bin;C:\msys64\usr\bin;"
+          C:\msys64\usr\bin\pacman.exe -Syu --noconfirm
+          C:\msys64\usr\bin\pacman.exe -S --noconfirm mingw-w64-x86_64-hdf5 mingw-w64-x86_64-pkgconf
+          ls C:\msys64\mingw64\lib | grep hdf5
       - name: Configure
         run: |
           if [ "${{ matrix.compiler }}" == "msvc" ]; then
             cmake -S "$SRCDIR" -B build
           elif [ "${{ matrix.compiler }}" == "mingw" ]; then
-            cmake -S "$SRCDIR" -B build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -G "MinGW Makefiles"
+            cmake -S "$SRCDIR" -B build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DCMAKE_EXE_LINKER_FLAGS="-L/C:\msys64\mingw64\lib" -G "MinGW Makefiles"
           else
             cmake -S "$SRCDIR" -B build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DCMAKE_C_FLAGS="-Wall -Wextra"
           fi

diff --git a/ExternData/Resources/BuildProjects/CMake/test.cmake b/ExternData/Resources/BuildProjects/CMake/test.cmake
@@ -43,9 +43,6 @@ if(EXISTS "${ED_TEST_DIR}")
     Test_ED_XML
     Test_ED_XML2
   )
-  if(MINGW)
-    list(REMOVE_ITEM ED_TESTS Test_ED_MAT)
-  endif()
   foreach(TEST ${ED_TESTS})
     add_executable(${TEST}
       "${ED_TEST_DIR}/${TEST}.cc"
@@ -75,8 +72,6 @@ if(EXISTS "${ED_TEST_DIR}")
     )
     if(UNIX)
       list(APPEND ED_ALL_LIBS m)
-    elseif(MINGW)
-      list(REMOVE_ITEM ED_ALL_LIBS hdf5)
     endif()
     target_link_libraries(${TEST} PRIVATE ${ED_ALL_LIBS})