Minor CMake fix and pin delvewheel

PolusAI · Aug 27, 2024 · 071d04a · 071d04a
1 parent 817195f
commit 071d04a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml
@@ -40,7 +40,7 @@ jobs:
 
       - name: Install cibuildwheel
         run: |
-          python -m pip install cibuildwheel==2.16.2 delvewheel wheel
+          python -m pip install cibuildwheel==2.16.2 delvewheel==1.7.1 wheel
 
       - name: Building wheels 
         run: |

diff --git a/.github/workflows/wheel_build.yml b/.github/workflows/wheel_build.yml
@@ -38,7 +38,7 @@ jobs:
 
       - name: Install cibuildwheel
         run: |
-          python -m pip install cibuildwheel==2.16.2 delvewheel wheel
+          python -m pip install cibuildwheel==2.16.2 delvewheel==1.7.1 wheel
 
       - name: Building wheels 
         run: |

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -50,9 +50,13 @@ include_directories(lib/pugixml)
 
 find_package(Threads QUIET)
 if (Threads_FOUND)
-    if (CMAKE_USE_PTHREADS_INIT)
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
-    endif (CMAKE_USE_PTHREADS_INIT)
+  if (CMAKE_USE_PTHREADS_INIT)
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /pthread")
+    endif()
+  endif (CMAKE_USE_PTHREADS_INIT) 
     list(APPEND Build_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
 else ()
 	message(STATUS "Unable to find threads. bfio_cpp must have a threading library i.e. pthreads.")