Configuration - Comment out basic build steps in MinGW workflow and u…

…pdate jemalloc library suffixes
Open-Cascade-SAS · Jan 12, 2025 · 633171f · 633171f
1 parent 71d0ac6
commit 633171f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/build-multiconfig-mingw.yml b/.github/workflows/build-multiconfig-mingw.yml
@@ -71,28 +71,28 @@ jobs:
         echo "$MSYSTEM_PREFIX/bin" >> $GITHUB_PATH
         echo "CMAKE_PREFIX_PATH=$MSYSTEM_PREFIX" >> $GITHUB_ENV
 
-    - name: Configure basic
-      shell: msys2 {0}
-      run: |
-        mkdir -p build
-        cd build
-        cmake -G "Ninja" \
-              -D CMAKE_C_COMPILER=${{ matrix.config.cc }} \
-              -D CMAKE_CXX_COMPILER=${{ matrix.config.cxx }} \
-              -D CMAKE_PREFIX_PATH=$MSYSTEM_PREFIX \
-              -D CMAKE_CXX_FLAGS="-Wall -Wextra" \
-              -D CMAKE_C_FLAGS="-Wall -Wextra" ..
-
-    - name: Build basic
-      shell: msys2 {0}
-      run: |
-        cd build
-        cmake --build . -- -j 4
-
-    - name: Clear up after build
-      shell: pwsh
-      run: |
-        Remove-Item -Recurse -Force build
+    # - name: Configure basic
+    #   shell: msys2 {0}
+    #   run: |
+    #     mkdir -p build
+    #     cd build
+    #     cmake -G "Ninja" \
+    #           -D CMAKE_C_COMPILER=${{ matrix.config.cc }} \
+    #           -D CMAKE_CXX_COMPILER=${{ matrix.config.cxx }} \
+    #           -D CMAKE_PREFIX_PATH=$MSYSTEM_PREFIX \
+    #           -D CMAKE_CXX_FLAGS="-Wall -Wextra" \
+    #           -D CMAKE_C_FLAGS="-Wall -Wextra" ..
+
+    # - name: Build basic
+    #   shell: msys2 {0}
+    #   run: |
+    #     cd build
+    #     cmake --build . -- -j 4
+
+    # - name: Clear up after build
+    #   shell: pwsh
+    #   run: |
+    #     Remove-Item -Recurse -Force build
 
     - name: Configure full shared
       shell: msys2 {0}

diff --git a/adm/cmake/jemalloc.cmake b/adm/cmake/jemalloc.cmake
@@ -68,7 +68,7 @@ endfunction()
 
 macro (SEARCH_JEMALLOC)
   # find static jemalloc lib
-  SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".a")
+  SET(CMAKE_FIND_LIBRARY_SUFFIXES "dll.a" ".lib" ".a")
   if (WIN32)
     JEMALLOC_LIB_SEARCH ("jemalloc" "STATIC")
   elseif(NOT WIN32)