chore: Simplify msvc build using vcpkg.

TokTok · Dec 26, 2023 · 39d5fb5 · 39d5fb5
1 parent 4eae3b5
commit 39d5fb5
Show file tree

Hide file tree

Showing 5 changed files with 149 additions and 148 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,141 +10,141 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-#  common:
-#    uses: TokTok/ci-tools/.github/workflows/common-ci.yml@master
-#
-#  mypy:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/checkout@v4
-#        with:
-#          submodules: recursive
-#      - name: Set up Python 3.9
-#        uses: actions/setup-python@v1
-#        with:
-#          python-version: 3.9
-#      - name: Install mypy
-#        run: pip install mypy
-#      - name: Run mypy
-#        run: |
-#          (find . -name "*.py" -and -not -name "conanfile.py"; grep -lR '^#!.*python') \
-#              | xargs -n1 -P8 mypy --strict
-#
-#  doxygen:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Set up Docker Buildx
-#        uses: docker/setup-buildx-action@v3
-#      - name: Docker Build
-#        uses: docker/build-push-action@v4
-#        with:
-#          file: other/docker/doxygen/Dockerfile
-#
-#  tokstyle:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Set up Docker Buildx
-#        uses: docker/setup-buildx-action@v3
-#      - name: Docker Build
-#        uses: docker/build-push-action@v4
-#        with:
-#          file: other/docker/tokstyle/Dockerfile
-#
-#  misra:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Set up Docker Buildx
-#        uses: docker/setup-buildx-action@v3
-#      - name: Docker Build
-#        uses: docker/build-push-action@v4
-#        with:
-#          file: other/docker/misra/Dockerfile
-#
-#  build-autotools:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Set up Docker Buildx
-#        uses: docker/setup-buildx-action@v3
-#      - name: Docker Build
-#        uses: docker/build-push-action@v4
-#        with:
-#          file: other/docker/autotools/Dockerfile
-#
-#  build-tcc:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Set up Docker Buildx
-#        uses: docker/setup-buildx-action@v3
-#      - name: Docker Build
-#        uses: docker/build-push-action@v4
-#        with:
-#          file: other/docker/tcc/Dockerfile
-#
-#  build-compcert:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Set up Docker Buildx
-#        uses: docker/setup-buildx-action@v3
-#      - name: Docker Build
-#        uses: docker/build-push-action@v4
-#        with:
-#          file: other/docker/compcert/Dockerfile
-#
-#  cimplefmt:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/checkout@v4
-#        with:
-#          submodules: recursive
-#      - name: Run cimplefmt
-#        run: other/docker/cimplefmt/run -u $(find tox* -name "*.[ch]")
-#
-#  build-win32:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/checkout@v4
-#        with:
-#          submodules: recursive
-#      - name: Cross compilation
-#        run: .github/scripts/cmake-win32 script
-#
-#  build-win64:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/checkout@v4
-#        with:
-#          submodules: recursive
-#      - name: Cross compilation
-#        run: .github/scripts/cmake-win64 script
-#
-#  build-macos:
-#    runs-on: macos-latest
-#    steps:
-#      - uses: actions/checkout@v4
-#        with:
-#          submodules: recursive
-#      - name: Build and test
-#        run: .github/scripts/cmake-osx
-#
-#  coverage-linux:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/checkout@v4
-#        with:
-#          submodules: recursive
-#      - name: Build, test, and upload coverage
-#        run: other/docker/coverage/run
-#
-#  build-android:
-#    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
+  common:
+    uses: TokTok/ci-tools/.github/workflows/common-ci.yml@master
+
+  mypy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.9
+      - name: Install mypy
+        run: pip install mypy
+      - name: Run mypy
+        run: |
+          (find . -name "*.py" -and -not -name "conanfile.py"; grep -lR '^#!.*python') \
+              | xargs -n1 -P8 mypy --strict
+
+  doxygen:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Docker Build
+        uses: docker/build-push-action@v4
+        with:
+          file: other/docker/doxygen/Dockerfile
+
+  tokstyle:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Docker Build
+        uses: docker/build-push-action@v4
+        with:
+          file: other/docker/tokstyle/Dockerfile
+
+  misra:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Docker Build
+        uses: docker/build-push-action@v4
+        with:
+          file: other/docker/misra/Dockerfile
+
+  build-autotools:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Docker Build
+        uses: docker/build-push-action@v4
+        with:
+          file: other/docker/autotools/Dockerfile
+
+  build-tcc:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Docker Build
+        uses: docker/build-push-action@v4
+        with:
+          file: other/docker/tcc/Dockerfile
+
+  build-compcert:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Docker Build
+        uses: docker/build-push-action@v4
+        with:
+          file: other/docker/compcert/Dockerfile
+
+  cimplefmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Run cimplefmt
+        run: other/docker/cimplefmt/run -u $(find tox* -name "*.[ch]")
+
+  build-win32:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Cross compilation
+        run: .github/scripts/cmake-win32 script
+
+  build-win64:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Cross compilation
+        run: .github/scripts/cmake-win64 script
+
+  build-macos:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Build and test
+        run: .github/scripts/cmake-osx
+
+  coverage-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Build, test, and upload coverage
+        run: other/docker/coverage/run
+
+  build-android:
+    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
 
   msvc:
     runs-on: windows-2022

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -308,7 +308,7 @@ set(toxcore_SOURCES
   toxcore/util.c
   toxcore/util.h)
 if(MSVC)
-  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} PkgConfig::LIBSODIUM)
+  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})
@@ -503,7 +503,7 @@ if(DHT_BOOTSTRAP)
   endif()
   target_link_libraries(DHT_bootstrap PRIVATE misc_tools)
   if(MSVC)
-    target_link_libraries(DHT_bootstrap PRIVATE PThreads4W::PThreads4W)
+    target_link_libraries(DHT_bootstrap PRIVATE unofficial-sodium::sodium PThreads4W::PThreads4W)
   endif()
   install(TARGETS DHT_bootstrap RUNTIME DESTINATION bin)
 endif()

diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
@@ -13,7 +13,7 @@ find_library(RT_LIBRARIES     rt    )
 find_library(SOCKET_LIBRARIES socket)
 
 # For toxcore.
-pkg_search_module(LIBSODIUM   libsodium IMPORTED_TARGET)
+pkg_search_module(LIBSODIUM   libsodium IMPORTED_TARGET REQUIRED)
 
 # For toxav.
 pkg_search_module(OPUS        opus      IMPORTED_TARGET)
@@ -31,4 +31,5 @@ pkg_search_module(LIBCONFIG   libconfig IMPORTED_TARGET)
 if(MSVC)
   # For toxcore.
   find_package(PThreads4W REQUIRED)
+  find_package(unofficial-sodium REQUIRED)
 endif()
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
   target_link_libraries(misc_tools PRIVATE toxcore_shared)
 endif()
 if(MSVC)
-  target_link_libraries(misc_tools PRIVATE PkgConfig::LIBSODIUM PThreads4W::PThreads4W)
+  target_link_libraries(misc_tools PRIVATE unofficial-sodium::sodium PThreads4W::PThreads4W)
 else()
   target_link_libraries(misc_tools PRIVATE ${LIBSODIUM_LIBRARIES})
   target_link_directories(misc_tools PUBLIC ${LIBSODIUM_LIBRARY_DIRS})

diff --git a/vcpkg.json b/vcpkg.json
@@ -1,11 +1,11 @@
 {
-    "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
-    "dependencies": [
-        "gtest",
-        "libsodium",
-        "libvpx",
-        "opus",
-        "pthreads",
-        "winsock2"
-    ]
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+  "dependencies": [
+    "gtest",
+    "libsodium",
+    "libvpx",
+    "opus",
+    "pthreads",
+    "winsock2"
+  ]
 }