Fix Windows build

Author: bgao-onet

CMakeLists.txt

@@ -21,6 +21,21 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 
 add_compile_definitions(MODULE_NAME="cppbase")
 
+if (MSVC)
+add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
+add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
+
+# -DWIN32_LEAN_AND_MEAN is for winsock.h has already been included error
+# -D_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING is for warning STL4009
+#   std::allocator<void> is deprecated in C++17
+add_definitions(
+    -D_WIN32_WINNT=0x0A00
+    -DNOMINMAX
+    -DWIN32_LEAN_AND_MEAN
+    -D_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING
+    -D_CRT_SECURE_NO_WARNINGS)
+endif()
+
 enable_testing()
 
 add_subdirectory(thirdparty)

CMakeSettings.json

@@ -1,27 +1,30 @@
-{
-  // 请参阅 https://go.microsoft.com//fwlink//?linkid=834763 了解有关此文件的详细信息。
-  "configurations": [
-    {
-      "name": "x64-Debug",
-      "generator": "Ninja",
-      "configurationType": "Debug",
-      "inheritEnvironments": [ "msvc_x64_x64" ],
-      "buildRoot": "${projectDir}\\vs2017\\build\\${name}",
-      "installRoot": "${projectDir}\\vs2017\\install\\${name}",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "-v",
-      "ctestCommandArgs": ""
-    },
-    {
-      "name": "x64-Release",
-      "generator": "Ninja",
-      "configurationType": "RelWithDebInfo",
-      "inheritEnvironments": [ "msvc_x64_x64" ],
-      "buildRoot": "${projectDir}\\vs2017\\build\\${name}",
-      "installRoot": "${projectDir}\\vs2017\\install\\${name}",
-      "cmakeCommandArgs": "",
-      "buildCommandArgs": "-v",
-      "ctestCommandArgs": ""
-    }
-  ]
+{
+    "configurations": [
+        {
+            "name": "x64-Debug",
+            "generator": "Ninja",
+            "configurationType": "Debug",
+            "inheritEnvironments": [
+                "msvc_x64_x64"
+            ],
+            "buildRoot": "${projectDir}\\build\\${name}",
+            "installRoot": "${projectDir}\\install\\${name}",
+            "cmakeCommandArgs": "",
+            "buildCommandArgs": "-v",
+            "ctestCommandArgs": ""
+        },
+        {
+            "name": "x64-Release",
+            "generator": "Ninja",
+            "configurationType": "Release",
+            "inheritEnvironments": [
+                "msvc_x64_x64"
+            ],
+            "buildRoot": "${projectDir}\\build\\${name}",
+            "installRoot": "${projectDir}\\install\\${name}",
+            "cmakeCommandArgs": "",
+            "buildCommandArgs": "-v",
+            "ctestCommandArgs": ""
+        }
+    ]
 }

common/MemoryLeaks.h

@@ -19,8 +19,8 @@
 #endif
 
 #if defined(_MSC_VER)
-#define VLD_FORCE_ENABLE
-#include <vld.h>
+// #define VLD_FORCE_ENABLE
+// #include <vld.h>
 #endif
 
 // See tests/common/MemoryLeaksTests.cpp for examples

common/ThreadPool.h

@@ -59,7 +59,7 @@ class DLLEXPORT ThreadPool
      *        the thread affinity for the 4 threads in the thread pool will be
      *        set to CPU1, CPU2, CPU3, CPU1, and CPU0 is not used.
      */
-    ThreadPool(uint32_t threads, ThreadPriority priority, uint32_t cpu_reserved = 0);
+    explicit ThreadPool(uint32_t threads, ThreadPriority priority, uint32_t cpu_reserved = 0);
     ~ThreadPool();
 
     template<class F, class... Args>

common/ThreadPool_intl.h

@@ -12,6 +12,8 @@
 
 namespace cppbase {
 
+static auto logger = logging::GetLoggerForCurrentModule();
+
 // #ifdef __linux__
 #if 0
 int32_t SetThreadPriority(ThreadPriority priority)
@@ -67,7 +69,7 @@ int32_t SetThreadPriority(ThreadPriority)
     return 0;
 }
 
-int32_t GetThreadPriority(ino64_t)
+int32_t GetThreadPriority(int64_t)
 {
     return 0;
 }
@@ -83,6 +85,7 @@ ThreadPool::ThreadPool(uint32_t threads, ThreadPriority priority, uint32_t cpu_r
     auto set_affinity = [&](uint32_t index, std::thread& thread) {
         if (cpu_reserved && cpu_reserved < cpu_nums)
         {
+#ifdef __linux__
             uint32_t cpu_id = index % (cpu_nums - cpu_reserved);
             cpu_set_t cpuset;
             CPU_ZERO(&cpuset);
@@ -91,8 +94,9 @@ ThreadPool::ThreadPool(uint32_t threads, ThreadPriority priority, uint32_t cpu_r
                                              sizeof(cpu_set_t), &cpuset);
             if (rc != 0)
             {
-                // olog_error("ThreadPool", "Error calling pthread_setaffinity_np: {}", rc);
+                logger->error("Error calling pthread_setaffinity_np: {}", rc);
             }
+#endif
         }
     };
 
@@ -116,9 +120,8 @@ ThreadPool::ThreadPool(uint32_t threads, ThreadPriority priority, uint32_t cpu_r
         });
         set_affinity(i, m_threads[i]);
     }
-    // olog_info("ThreadPool",
-    //           "Created thread pool with {} threads at priority {}, {} CPU core(s) reserved",
-    //           threads, priority, cpu_reserved);
+    logger->info("Created thread pool with {} threads at priority {}, {} CPU core(s) reserved",
+        threads, priority, cpu_reserved);
 }
 
 // the destructor joins all threads

logging/Logging_intl.h

@@ -24,7 +24,7 @@ class Instance
         fs::path log_conf = fs::path(filesystem::GetConfigDir())/filesystem::LogConfigFilename;
         if (fs::exists(log_conf))
         {
-            spdlog_setup::from_file(log_conf.c_str());
+            spdlog_setup::from_file(log_conf.generic_string());
         }
         else
         {

tests/common/CMakeLists.txt

@@ -17,7 +17,7 @@ target_include_directories(common_test PUBLIC
   $<INSTALL_INTERFACE:include>
 )
 
-set_target_warnings_as_error(TARGET common_test)
+# set_target_warnings_as_error(TARGET common_test)
 target_compile_features(common_test PRIVATE ${CXX_STD})
 
 target_link_libraries(common_test gtest spdlog)

tests/common/FlagsTests.cpp

@@ -27,7 +27,7 @@ TEST(FlagsTests, FlagsTests)
 {
     // build flags
     FooFlags flags{FooFlag::FLAG_A, FooFlag::FLAG_B, FooFlag::FLAG_C};
-    EXPECT_EQ(flags, 0x1 | 0x2 | 0x4);
+    EXPECT_EQ(static_cast<int>(flags), 0x1 | 0x2 | 0x4);
 
     // check flags
     EXPECT_TRUE(flags & FooFlag::FLAG_A);
@@ -44,9 +44,9 @@ TEST(FlagsTests, FlagsTests)
     flags.SetFlag(FooFlag::FLAG_D, false); // set D off
     EXPECT_FALSE(flags & FooFlag::FLAG_D);
     flags.SetFlags({FooFlag::FLAG_A, FooFlag::FLAG_B}, false); // set A/B off
-    EXPECT_EQ(flags, 0x4);
+    EXPECT_EQ(static_cast<int>(flags), 0x4);
     flags |= {FooFlag::FLAG_E, FooFlag::FLAG_F}; // set E/F on
-    EXPECT_EQ(flags, 0x4 | 0x10 | 0x20);
+    EXPECT_EQ(static_cast<int>(flags), 0x4 | 0x10 | 0x20);
     flags &= ~FooFlags{FooFlag::FLAG_E, FooFlag::FLAG_F}; // set E/F off
-    EXPECT_EQ(flags, 0x4);
+    EXPECT_EQ(static_cast<int>(flags), 0x4);
 }

tests/common/ThreadPoolTests.cpp

@@ -21,8 +21,10 @@ TEST(ThreadPoolTests, SimpleTest)
     for(int32_t i = 0; i < 8; ++i)
     {
         results.emplace_back(pool.Enqueue([i] {
+#ifdef __linux__
             std::cout << "ThreadPoolTests::SimpleTest thread=" << i
                       << " running on CPU=" << sched_getcpu() << std::endl;
+#endif
             std::this_thread::sleep_for(std::chrono::seconds(1));
             return i*i;
         }));
@@ -45,8 +47,10 @@ TEST(ThreadPoolTests, PriorityAndCpuTest)
     for(int32_t i = 0; i < 8; ++i)
     {
         results.emplace_back(pool.Enqueue([i] {
+#ifdef __linux__
             std::cout << "ThreadPoolTests::PriorityAndCpuTest thread=" << i
                       << " running on CPU=" << sched_getcpu() << std::endl;
+#endif
             std::this_thread::sleep_for(std::chrono::seconds(1));
             return i*i;
         }));

tests/logging/CMakeLists.txt

@@ -13,7 +13,7 @@ target_include_directories(logging_test PUBLIC
   $<INSTALL_INTERFACE:include>
 )
 
-set_target_warnings_as_error(TARGET logging_test)
+# set_target_warnings_as_error(TARGET logging_test)
 target_compile_features(logging_test PRIVATE ${CXX_STD})
 
 target_link_libraries(logging_test gtest spdlog)

thirdparty/CMakeLists.txt

@@ -98,6 +98,7 @@ add_subdirectory(${sigslot_SOURCE_DIR} ${sigslot_BINARY_DIR})
 #                        spdlog
 # ============================================================
 #
+set(SPDLOG_FMT_EXTERNAL ON CACHE BOOL "")
 download_project(
   PROJ     spdlog
   URL      ${CMAKE_CURRENT_SOURCE_DIR}/spdlog/v1.8.2.tar.gz
@@ -119,15 +120,16 @@ download_project(
 add_library(stduuid INTERFACE)
 target_include_directories(stduuid INTERFACE ${stduuid_SOURCE_DIR}/include)
 
-if (MSVC)
+if (FALSE)
 # ============================================================
 #                        vld
 # ============================================================
 #
+set(VLD_FMT_EXTERNAL ON CACHE BOOL "")
 download_project(
   PROJ     vld
   URL      ${CMAKE_CURRENT_SOURCE_DIR}/vld/2.5.2.tar.gz
-  URL_HASH MD5=44d2edc7e006b97be4bdf43de7b5f3b5
+  URL_HASH MD5=daa96b5e7427411ba7258fcf8e72df92
   QUIET
 )
 add_subdirectory(${vld_SOURCE_DIR} ${vld_BINARY_DIR})