Fix MSVC Windows build

Signed-off-by: Vlad Gheorghiu <[email protected]>
softwareQinc · Jan 23, 2025 · a3cec85 · a3cec85
1 parent 6847ebe
commit a3cec85
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,8 +37,11 @@ endif()
 
 # Windows issues with Microsoft Visual Studio
 if(MSVC)
+  add_definitions(-DNOMINMAX)
+  # MSVC lack of pthread.h
   include_directories(SYSTEM libs/third_party/pthreadwin32)
-  add_compile_options(-bigobj)
+  add_compile_options(/bigobj)
+  add_compile_options(/utf-8)
   if(MSVC_VERSION GREATER_EQUAL 1914)
     add_compile_options("/Zc:__cplusplus")
   endif()

diff --git a/cmake/pystaq.cmake b/cmake/pystaq.cmake
@@ -1,5 +1,13 @@
 # LSP and CMake support for pystaq
 
+if(MSVC)
+  add_definitions(-DNOMINMAX)
+  # MSVC lack of pthread.h
+  include_directories(SYSTEM ${STAQ_INSTALL_DIR}/third_party/pthreadwin32)
+  add_compile_options(/bigobj)
+  add_compile_options(/utf-8)
+endif()
+
 # pybind11
 include_directories(SYSTEM ${PYBIND11_INCLUDE_DIRS})
 target_include_directories(

diff --git a/cmake/staq_msvc.cmake b/cmake/staq_msvc.cmake
@@ -1,9 +1,7 @@
-# MSVC lack of pthread.h
 if(MSVC)
+  add_definitions(-DNOMINMAX)
+  # MSVC lack of pthread.h
   include_directories(SYSTEM ${STAQ_INSTALL_DIR}/third_party/pthreadwin32)
-endif()
-
-# MSVC bigobj
-if(MSVC)
-  add_compile_options(-bigobj)
+  add_compile_options(/bigobj)
+  add_compile_options(/utf-8)
 endif()
diff --git a/libs/third_party/easy/sat2/cardinality.hpp b/libs/third_party/easy/sat2/cardinality.hpp
@@ -40,7 +40,9 @@
 
 #pragma once
 
+#include <algorithm>
 #include <deque>
+#include <vector>
 
 namespace easy::sat2 {
 
@@ -158,8 +160,9 @@ inline void increase_totalizer(std::vector<std::vector<int>>& dest, int& sid,
                                std::shared_ptr<totalizer_tree>& t,
                                uint32_t rhs) {
     uint32_t const kmin = std::min(rhs + 1, t->num_inputs);
-    if (kmin <= t->vars.size())
+    if (kmin <= t->vars.size()) {
         return;
+    }
 
     increase_totalizer(dest, sid, t->left, rhs);
     increase_totalizer(dest, sid, t->right, rhs);

diff --git a/libs/third_party/glucose/glucose.hpp b/libs/third_party/glucose/glucose.hpp
@@ -2075,6 +2075,7 @@ static inline double Glucose::cpuTime(void) {
 // for that
 // Added by Vlad on Mar. 30, 2020, Windows compatibility
 #if defined(_WIN32) && defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+#include <windows.h>
 #define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64
 struct timezone {
     int tz_minuteswest; /* minutes W of Greenwich */
@@ -2111,7 +2112,7 @@ int GetTimeOfDay(struct timeval* tv, struct timezone* tz) {
 
     return 0;
 }
-#endif // _WIN32 && MSC_VER
+#endif // _WIN32 && _MSC_VER
 // END added by Vlad on Mar. 30, 2020, Windows compatibility
 
 static inline double Glucose::realTime() {

diff --git a/setup.py b/setup.py
@@ -60,7 +60,9 @@ def _load_shared_obj(name):
     and not sys.platform == "cygwin"
     and not sys.platform == "msys"
 ):
+    (extra_compile_args.append("-DNOMINMAX"),)
     extra_compile_args.append("-Ilibs/third_party/pthreadwin32")
+    extra_compile_args.append("/utf-8")
 
 ext_modules = [
     Pybind11Extension(

diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
@@ -11,10 +11,15 @@ FetchContent_Declare(
   GIT_TAG main
   GIT_SHALLOW TRUE
   GIT_PROGRESS TRUE)
-# For Windows: Prevent overriding the parent project's compiler/linker settings,
-# and add bigobj option
+
+# Windows issues with Microsoft Visual Studio
+
+# Prevent overriding the parent project's compiler/linker settings, and add
+# bigobj and utf-8 option
 if(MSVC)
-  add_compile_options(-bigobj)
+  add_definitions(-DNOMINMAX)
+  add_compile_options(/bigobj)
+  add_compile_options(/utf-8)
   set(gtest_force_shared_crt
       ON
       CACHE BOOL "" FORCE)