Update staq_msvc_pthread.cmake

softwareQinc · Nov 30, 2023 · 610c5fc · 610c5fc
1 parent 716b1c3
commit 610c5fc
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -13,8 +13,8 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
-    #        os: [ windows-latest ]
+        #    os: [ ubuntu-latest, macos-latest, windows-latest ]
+        os: [ windows-latest ]
     runs-on: ${{ matrix.os }}
 
     steps:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -110,7 +110,7 @@ if (STAQ_INSTALL_SOURCES)
             INSTALL_DESTINATION "lib/cmake/${PROJECT_NAME}"
     )
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/staqConfig.cmake" DESTINATION "lib/cmake/${PROJECT_NAME}")
-    install(FILES "${CMAKE_SOURCE_DIR}/cmake/staq_msvc_pthread.cmake" DESTINATION "lib/cmake/${PROJECT_NAME}")
+    install(FILES "${CMAKE_SOURCE_DIR}/cmake/staq_msvc.cmake" DESTINATION "lib/cmake/${PROJECT_NAME}")
 endif ()
 
 #### Uninstall

diff --git a/cmake/staqConfig.cmake.in b/cmake/staqConfig.cmake.in
@@ -1,6 +1,6 @@
 @PACKAGE_INIT@
 
 set(STAQ_INSTALL_DIR "@STAQ_INSTALL_DIR@")
-include("${CMAKE_CURRENT_LIST_DIR}/staq_msvc_pthread.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/staq_msvc.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/staq_targets.cmake")
 message(STATUS "Found staq's source code in @STAQ_INSTALL_DIR@")
diff --git a/cmake/staq_msvc.cmake b/cmake/staq_msvc.cmake
@@ -0,0 +1,9 @@
+#### MSVC lack of pthread.h
+if (MSVC)
+    include_directories(SYSTEM ${STAQ_INSTALL_DIR}/third_party/pthreadwin32)
+endif ()
+
+#### MSVC bigobj
+if (MSVC)
+    add_compile_options(-bigobj)
+endif ()
diff --git a/cmake/staq_msvc_pthread.cmake b/cmake/staq_msvc_pthread.cmake