chore: Simplify msvc build using vcpkg.

TokTok · Jan 6, 2024 · 380f8ee · 380f8ee
1 parent 5cac6d7
commit 380f8ee
Show file tree

Hide file tree

Showing 17 changed files with 217 additions and 119 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,17 +44,16 @@ jobs:
       - name: Run cimplefmt
         run: other/docker/cimplefmt/run -u $(find tox* -name "*.[ch]")
 
-  build-windows:
-    strategy:
-      matrix:
-        bits: [32, 64]
+  build-android:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: Cross compilation
-        run: .github/scripts/cmake-win${{ matrix.bits }} script
+      - run: .github/scripts/cmake-android armeabi-v7a
+      - run: .github/scripts/cmake-android arm64-v8a
+      - run: .github/scripts/cmake-android x86
+      - run: .github/scripts/cmake-android x86_64
 
   build-macos:
     runs-on: macos-latest
@@ -65,16 +64,44 @@ jobs:
       - name: Build and test
         run: .github/scripts/cmake-osx
 
-  build-android:
+  build-msvc:
+    strategy:
+      matrix:
+        version: [2019, 2022]
+    runs-on: windows-${{ matrix.version }}
+    env:
+      VCPKG_ROOT: "C:/vcpkg"
+      VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Export GitHub Actions cache environment variables
+        uses: actions/github-script@v6
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+      - name: Configure CMake
+        run: cmake --preset windows-default
+      - name: Build
+        run: cmake --build _build
+      - name: Test
+        run: |
+          cd _build
+          ctest -j50 --output-on-failure --rerun-failed --repeat until-pass:6 --build-config Debug
+
+  build-windows:
+    strategy:
+      matrix:
+        bits: [32, 64]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - run: .github/scripts/cmake-android armeabi-v7a
-      - run: .github/scripts/cmake-android arm64-v8a
-      - run: .github/scripts/cmake-android x86
-      - run: .github/scripts/cmake-android x86_64
+      - name: Cross compilation
+        run: .github/scripts/cmake-win${{ matrix.bits }} script
 
   mypy:
     runs-on: ubuntu-latest

diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,8 @@ Thumbs.db
 /_build
 /_install
 /tox-0.0.0*
+/.vs
+/CppProperties.json
 CMakeCache.txt
 CMakeFiles
 Makefile

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -81,7 +81,7 @@ find_package(GTest)
 set(CMAKE_MACOSX_RPATH ON)
 
 # Set standard version for compiler.
-if(MSVC)
+if(MSVC AND MSVC_TOOLSET_VERSION LESS 143)
   # https://developercommunity.visualstudio.com/t/older-winsdk-headers-are-incompatible-with-zcprepr/1593479
   set(CMAKE_C_STANDARD 99)
 else()
@@ -94,6 +94,35 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 message(STATUS "Supported C compiler features = ${CMAKE_C_COMPILE_FEATURES}")
 message(STATUS "Supported C++ compiler features = ${CMAKE_CXX_COMPILE_FEATURES}")
 
+# Enable some warnings if we know the compiler.
+if(MSVC)
+  add_compile_options(/W4 /analyze)
+  add_compile_options(/wd4100)  # unreferenced formal parameter
+  add_compile_options(/wd4267)  # narrowing conversion
+  add_compile_options(/wd4244)  # narrowing conversion
+  add_compile_options(/wd4127)  # conditional expression is constant
+  add_compile_options(/wd4995)  # #pragma deprecated
+  add_compile_options(/wd4018)  # signed/unsigned compare
+  add_compile_options(/wd4310)  # cast truncates constant value
+  add_compile_options(/wd4389)  # signed/unsigned compare
+  add_compile_options(/wd4245)  # signed/unsigned assign/return/function call
+  add_compile_options(/wd4200)  # nonstandard extension used: zero-sized array in struct/union
+  add_compile_options(/wd4702)  # unreachable code
+  add_compile_options(/wd6340)  # unsigned int passed to signed parameter
+  add_compile_options(/wd6326)  # potential comparison of a constant with another constant
+
+  # TODO(iphydf): Look into these
+  add_compile_options(/wd4996)  # use WSAAddressToStringW() instead of WSAAddressToStringA()
+  add_compile_options(/wd6255)  # don't use alloca
+  add_compile_options(/wd6385)  # reading invalid data
+  add_compile_options(/wd6001)  # using uninitialized memory
+  add_compile_options(/wd6101)  # returning uninitialized memory
+  add_compile_options(/wd6386)  # buffer overrun
+  add_compile_options(/wd6011)  # NULL dereference
+  add_compile_options(/wd6031)  # sscanf return value ignored
+  add_compile_options(/wd6387)  # passing NULL to fwrite
+endif()
+
 set(MIN_LOGGER_LEVEL "" CACHE STRING "Logging level to use (TRACE, DEBUG, INFO, WARNING, ERROR)")
 if(MIN_LOGGER_LEVEL)
   if(("${MIN_LOGGER_LEVEL}" STREQUAL "TRACE") OR
@@ -307,10 +336,14 @@ set(toxcore_SOURCES
   toxcore/tox_unpack.h
   toxcore/util.c
   toxcore/util.h)
-set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} ${LIBSODIUM_LIBRARIES})
-set(toxcore_LINK_DIRECTORIES ${toxcore_LINK_DIRECTORIES} ${LIBSODIUM_LIBRARY_DIRS})
-set(toxcore_INCLUDE_DIRECTORIES ${toxcore_INCLUDE_DIRECTORIES} ${LIBSODIUM_INCLUDE_DIRS})
-set(toxcore_COMPILE_OPTIONS ${toxcore_COMPILE_OPTIONS} ${LIBSODIUM_CFLAGS_OTHER})
+if(TARGET unofficial-sodium::sodium)
+  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} unofficial-sodium::sodium)
+else()
+  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} ${LIBSODIUM_LIBRARIES})
+  set(toxcore_LINK_DIRECTORIES ${toxcore_LINK_DIRECTORIES} ${LIBSODIUM_LIBRARY_DIRS})
+  set(toxcore_INCLUDE_DIRECTORIES ${toxcore_INCLUDE_DIRECTORIES} ${LIBSODIUM_INCLUDE_DIRS})
+  set(toxcore_COMPILE_OPTIONS ${toxcore_COMPILE_OPTIONS} ${LIBSODIUM_CFLAGS_OTHER})
+endif()
 set(toxcore_PKGCONFIG_REQUIRES ${toxcore_PKGCONFIG_REQUIRES} libsodium)
 set(toxcore_API_HEADERS
   ${toxcore_SOURCE_DIR}/toxcore/tox.h^tox
@@ -346,10 +379,14 @@ if(BUILD_TOXAV)
   set(toxcore_API_HEADERS ${toxcore_API_HEADERS}
     ${toxcore_SOURCE_DIR}/toxav/toxav.h^toxav)
 
-  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} ${OPUS_LIBRARIES} ${VPX_LIBRARIES})
-  set(toxcore_LINK_DIRECTORIES ${toxcore_LINK_DIRECTORIES} ${OPUS_LIBRARY_DIRS} ${VPX_LIBRARY_DIRS})
-  set(toxcore_INCLUDE_DIRECTORIES ${toxcore_INCLUDE_DIRECTORIES} ${OPUS_INCLUDE_DIRS} ${VPX_INCLUDE_DIRS})
-  set(toxcore_COMPILE_OPTIONS ${toxcore_COMPILE_OPTIONS} ${OPUS_CFLAGS_OTHER} ${VPX_CFLAGS_OTHER})
+  if(MSVC)
+    set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} PkgConfig::OPUS PkgConfig::VPX)
+  else()
+    set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} ${OPUS_LIBRARIES} ${VPX_LIBRARIES})
+    set(toxcore_LINK_DIRECTORIES ${toxcore_LINK_DIRECTORIES} ${OPUS_LIBRARY_DIRS} ${VPX_LIBRARY_DIRS})
+    set(toxcore_INCLUDE_DIRECTORIES ${toxcore_INCLUDE_DIRECTORIES} ${OPUS_INCLUDE_DIRS} ${VPX_INCLUDE_DIRS})
+    set(toxcore_COMPILE_OPTIONS ${toxcore_COMPILE_OPTIONS} ${OPUS_CFLAGS_OTHER} ${VPX_CFLAGS_OTHER})
+  endif()
   set(toxcore_PKGCONFIG_REQUIRES ${toxcore_PKGCONFIG_REQUIRES} opus vpx)
 endif()
 
@@ -380,7 +417,6 @@ if(CMAKE_THREAD_LIBS_INIT)
   set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
-
 if(NSL_LIBRARIES)
   set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} ${NSL_LIBRARIES})
   set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} -lnsl)
@@ -396,9 +432,13 @@ if(SOCKET_LIBRARIES)
   set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} -lsocket)
 endif()
 
+if(TARGET PThreads4W::PThreads4W)
+  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} PThreads4W::PThreads4W)
+elseif(TARGET Threads::Threads)
+  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} Threads::Threads)
+endif()
 if(WIN32)
-  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} ws2_32 iphlpapi)
-  set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} -lws2_32 -liphlpapi)
+  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} iphlpapi wsock32 ws2_32)
 endif()
 
 ################################################################################
@@ -496,6 +536,14 @@ if(DHT_BOOTSTRAP)
     target_link_libraries(DHT_bootstrap PRIVATE toxcore_shared)
   endif()
   target_link_libraries(DHT_bootstrap PRIVATE misc_tools)
+  if(TARGET unofficial-sodium::sodium)
+    target_link_libraries(DHT_bootstrap PRIVATE unofficial-sodium::sodium)
+  endif()
+  if(TARGET PThreads4W::PThreads4W)
+    target_link_libraries(DHT_bootstrap PRIVATE PThreads4W::PThreads4W)
+  elseif(TARGET Threads::Threads)
+    target_link_libraries(DHT_bootstrap PRIVATE Threads::Threads)
+  endif()
   install(TARGETS DHT_bootstrap RUNTIME DESTINATION bin)
 endif()
 

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -0,0 +1,21 @@
+{
+    "version": 3,
+    "configurePresets": [
+        {
+            "name": "windows-default",
+            "binaryDir": "${sourceDir}/_build",
+            "cacheVariables": {
+                "ENABLE_SHARED": true,
+                "ENABLE_STATIC": true,
+                "AUTOTEST": true,
+                "BUILD_MISC_TESTS": true,
+                "BOOTSTRAP_DAEMON": false,
+                "MUST_BUILD_TOXAV": true,
+                "TEST_TIMEOUT_SECONDS": "60",
+                "CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS": true,
+                "CMAKE_COMPILE_WARNING_AS_ERROR": true,
+                "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+            }
+        }
+    ]
+}
diff --git a/auto_tests/CMakeLists.txt b/auto_tests/CMakeLists.txt
@@ -9,6 +9,11 @@ if(TARGET toxcore_static)
 else()
   target_link_libraries(auto_test_support PRIVATE toxcore_shared)
 endif()
+if(TARGET PThreads4W::PThreads4W)
+  target_link_libraries(auto_test_support PRIVATE PThreads4W::PThreads4W)
+elseif(TARGET Threads::Threads)
+  target_link_libraries(auto_test_support PRIVATE Threads::Threads)
+endif()
 
 function(auto_test target)
   add_executable(auto_${target}_test ${target}_test.c)
@@ -18,12 +23,15 @@ function(auto_test target)
   else()
     target_link_libraries(auto_${target}_test PRIVATE toxcore_shared)
   endif()
-  if(NOT ARGV1 STREQUAL "DONT_RUN")
-    add_test(NAME ${target} COMMAND ${CROSSCOMPILING_EMULATOR} auto_${target}_test)
-    set_tests_properties(${target} PROPERTIES TIMEOUT "${TEST_TIMEOUT_SECONDS}")
-    # add the source dir as environment variable, so the testdata can be found
-    set_tests_properties(${target} PROPERTIES ENVIRONMENT "LLVM_PROFILE_FILE=${target}.profraw;srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
+  if(TARGET PThreads4W::PThreads4W)
+    target_link_libraries(auto_${target}_test PRIVATE PThreads4W::PThreads4W)
+  elseif(TARGET Threads::Threads)
+    target_link_libraries(auto_${target}_test PRIVATE Threads::Threads)
   endif()
+  add_test(NAME ${target} COMMAND ${CROSSCOMPILING_EMULATOR} auto_${target}_test)
+  set_tests_properties(${target} PROPERTIES TIMEOUT "${TEST_TIMEOUT_SECONDS}")
+  # add the source dir as environment variable, so the testdata can be found
+  set_tests_properties(${target} PROPERTIES ENVIRONMENT "LLVM_PROFILE_FILE=${target}.profraw;srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
 endfunction()
 
 auto_test(TCP)
@@ -89,15 +97,20 @@ if(BUILD_TOXAV)
   auto_test(toxav_basic)
   auto_test(toxav_many)
 
-  target_link_libraries(auto_toxav_basic_test PRIVATE ${VPX_LIBRARIES})
-  target_link_directories(auto_toxav_basic_test PRIVATE ${VPX_LIBRARY_DIRS})
-  target_include_directories(auto_toxav_basic_test SYSTEM PRIVATE ${VPX_INCLUDE_DIRS})
-  target_compile_options(auto_toxav_basic_test PRIVATE ${VPX_CFLAGS_OTHER})
+  if(MSVC)
+    target_link_libraries(auto_toxav_basic_test PRIVATE PkgConfig::VPX)
+    target_link_libraries(auto_toxav_many_test PRIVATE PkgConfig::VPX)
+  else()
+    target_link_libraries(auto_toxav_basic_test PRIVATE ${VPX_LIBRARIES})
+    target_link_directories(auto_toxav_basic_test PRIVATE ${VPX_LIBRARY_DIRS})
+    target_include_directories(auto_toxav_basic_test SYSTEM PRIVATE ${VPX_INCLUDE_DIRS})
+    target_compile_options(auto_toxav_basic_test PRIVATE ${VPX_CFLAGS_OTHER})
 
-  target_link_libraries(auto_toxav_many_test PRIVATE ${VPX_LIBRARIES})
-  target_link_directories(auto_toxav_many_test PRIVATE ${VPX_LIBRARY_DIRS})
-  target_include_directories(auto_toxav_many_test SYSTEM PRIVATE ${VPX_INCLUDE_DIRS})
-  target_compile_options(auto_toxav_many_test PRIVATE ${VPX_CFLAGS_OTHER})
+    target_link_libraries(auto_toxav_many_test PRIVATE ${VPX_LIBRARIES})
+    target_link_directories(auto_toxav_many_test PRIVATE ${VPX_LIBRARY_DIRS})
+    target_include_directories(auto_toxav_many_test SYSTEM PRIVATE ${VPX_INCLUDE_DIRS})
+    target_compile_options(auto_toxav_many_test PRIVATE ${VPX_CFLAGS_OTHER})
+  endif()
 endif()
 
 if(PROXY_TEST)

diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
@@ -1,19 +1,26 @@
 ###############################################################################
 #
-# :: For UNIX-like systems that have pkg-config.
+# :: For systems that have pkg-config.
 #
 ###############################################################################
 
-include(ModulePackage)
-
-find_package(Threads REQUIRED)
+find_package(PkgConfig REQUIRED)
 
 find_library(NSL_LIBRARIES    nsl   )
 find_library(RT_LIBRARIES     rt    )
 find_library(SOCKET_LIBRARIES socket)
 
+find_package(pthreads QUIET)
+if(NOT TARGET PThreads4W::PThreads4W)
+  set(THREADS_PREFER_PTHREAD_FLAG ON)
+  find_package(Threads REQUIRED)
+endif()
+
 # For toxcore.
-pkg_search_module(LIBSODIUM   libsodium IMPORTED_TARGET)
+pkg_search_module(LIBSODIUM   libsodium IMPORTED_TARGET REQUIRED)
+if(MSVC)
+  find_package(unofficial-sodium REQUIRED)
+endif()
 
 # For toxav.
 pkg_search_module(OPUS        opus      IMPORTED_TARGET)
@@ -27,56 +34,3 @@ endif()
 
 # For tox-bootstrapd.
 pkg_search_module(LIBCONFIG   libconfig IMPORTED_TARGET)
-
-###############################################################################
-#
-# :: For MSVC Windows builds.
-#
-# These require specific installation paths of dependencies:
-# - libsodium in third-party/libsodium/Win32/Release/v140/dynamic
-# - pthreads in third-party/pthreads-win32/Pre-built.2
-#
-###############################################################################
-
-if(MSVC)
-  # libsodium
-  # ---------
-  if(NOT LIBSODIUM_FOUND)
-    find_library(LIBSODIUM_LIBRARIES
-      NAMES sodium libsodium
-      PATHS
-        "third_party/libsodium/Win32/Release/v140/dynamic"
-        "third_party/libsodium/x64/Release/v140/dynamic"
-    )
-    if(LIBSODIUM_LIBRARIES)
-      include_directories("third_party/libsodium/include")
-      set(LIBSODIUM_FOUND TRUE)
-      message("libsodium: ${LIBSODIUM_LIBRARIES}")
-    else()
-      message(FATAL_ERROR "libsodium libraries not found")
-    endif()
-  endif()
-
-  # pthreads
-  # --------
-  if(CMAKE_USE_WIN32_THREADS_INIT)
-    find_library(CMAKE_THREAD_LIBS_INIT
-      NAMES pthreadVC2
-      PATHS
-        "third_party/pthreads-win32/Pre-built.2/lib/x86"
-        "third_party/pthreads-win32/Pre-built.2/lib/x64"
-    )
-    if(CMAKE_THREAD_LIBS_INIT)
-      include_directories("third_party/pthreads-win32/Pre-built.2/include")
-      add_definitions(-DHAVE_STRUCT_TIMESPEC)
-      message("libpthreads: ${CMAKE_THREAD_LIBS_INIT}")
-    else()
-      find_package(pthreads4w)
-      if(NOT pthreads4w_FOUND)
-        message(FATAL_ERROR "libpthreads libraries not found")
-      endif()
-      include_directories(${pthreads4w_INCLUDE_DIR})
-      link_libraries(${pthreads4w_LIBRARIES})
-    endif()
-  endif()
-endif()
diff --git a/cmake/ModulePackage.cmake b/cmake/ModulePackage.cmake
@@ -19,18 +19,16 @@ if(FULLY_STATIC)
   set(ENABLE_STATIC ON)
 endif()
 
-find_package(PkgConfig)
-
 function(add_module lib)
-  set(${lib}_SOURCES ${ARGN} PARENT_SCOPE)
-
   if(ENABLE_SHARED)
     add_library(${lib}_shared SHARED ${ARGN})
     set_target_properties(${lib}_shared PROPERTIES OUTPUT_NAME ${lib})
   endif()
   if(ENABLE_STATIC)
     add_library(${lib}_static STATIC ${ARGN})
-    set_target_properties(${lib}_static PROPERTIES OUTPUT_NAME ${lib})
+    if(NOT MSVC)
+      set_target_properties(${lib}_static PROPERTIES OUTPUT_NAME ${lib})
+    endif()
   endif()
 endfunction()