vcpkg

fundamental · Nov 12, 2023 · c1a6beb · c1a6beb
1 parent e96e54f
commit c1a6beb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -13,8 +13,8 @@ jobs:
             name: "Windows MSVC",
             enabled: 1,
             os: windows-latest,
-            deps: "vcpkg install liblo --triplet x86-windows --host-triplet x86-windows",
-            config: "cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DWERROR=1 -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON .",
+            deps: "",
+            config: "cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DWERROR=1 .",
             build: "cmake --build .",
             test: "ctest --output-on-failure"
           }

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,11 +25,15 @@ else()
     set(GUI_FOUND FALSE)
 endif(FLTK_FOUND)
 
-find_package(PkgConfig)
-if(PKG_CONFIG_FOUND)
-    pkg_check_modules(LIBLO liblo>=0.28)
-    if(NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Windows"))
-        pkg_check_modules(JACK jack)
+if(MSVC)
+    find_package(liblo 0.28)
+else()
+    find_package(PkgConfig)
+    if(PKG_CONFIG_FOUND)
+        pkg_check_modules(LIBLO liblo>=0.28)
+        if(NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Windows"))
+            pkg_check_modules(JACK jack)
+        endif()
     endif()
 endif()