Add support for downloading the tarball.

Author: kixelated

CMakeLists.txt

@@ -20,26 +20,19 @@ option(MOQ_LOCAL "Path to moq repo for local development" "")
 
 if(MOQ_LOCAL)
   add_subdirectory(${MOQ_LOCAL}/rs/libmoq moq)
+  target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE moq)
 else()
   include(FetchContent)
   FetchContent_Declare(
     moq
-    URL
-      https://github.com/kixelated/moq/releases/download/v${MOQ_VERSION}/moq-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}.tar.gz
+    URL https://github.com/moq-dev/moq/releases/download/libmoq-v${MOQ_VERSION}/moq-${MOQ_VERSION}-${MOQ_TARGET}.${MOQ_ARCHIVE}
   )
   FetchContent_MakeAvailable(moq)
 
-  add_library(moq SHARED IMPORTED GLOBAL)
-  set_target_properties(
-    moq
-    PROPERTIES
-      IMPORTED_LOCATION "${moq_SOURCE_DIR}/lib/libmoq.dylib"
-      INTERFACE_INCLUDE_DIRECTORIES "${moq_SOURCE_DIR}/include"
-  )
+  find_package(moq REQUIRED PATHS ${moq_SOURCE_DIR} NO_DEFAULT_PATH)
+  target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE moq::moq)
 endif()
 
-target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE moq)
-
 if(ENABLE_FRONTEND_API)
   find_package(obs-frontend-api REQUIRED)
   target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE OBS::obs-frontend-api)

CMakePresets.json

@@ -12,7 +12,10 @@
       "cacheVariables": {
         "ENABLE_FRONTEND_API": false,
         "ENABLE_QT": false,
-        "CMAKE_EXPORT_COMPILE_COMMANDS": true
+        "CMAKE_EXPORT_COMPILE_COMMANDS": true,
+        "MOQ_VERSION": "0.1.2",
+        "MOQ_LIB": "libmoq.a",
+        "MOQ_ARCHIVE": "tar.gz"
       }
     },
     {
@@ -37,7 +40,8 @@
         "CMAKE_OSX_DEPLOYMENT_TARGET": "12.0",
         "CMAKE_OSX_ARCHITECTURES": "arm64",
         "CODESIGN_IDENTITY": "$penv{CODESIGN_IDENT}",
-        "CODESIGN_TEAM": "$penv{CODESIGN_TEAM}"
+        "CODESIGN_TEAM": "$penv{CODESIGN_TEAM}",
+        "MOQ_TARGET": "aarch64-apple-darwin"
       }
     },
     {
@@ -71,6 +75,11 @@
       "warnings": {
         "dev": true,
         "deprecated": true
+      },
+      "cacheVariables": {
+        "MOQ_TARGET": "x86_64-pc-windows-msvc",
+        "MOQ_LIB": "moq.lib",
+        "MOQ_ARCHIVE": "zip"
       }
     },
     {
@@ -104,7 +113,8 @@
       },
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
-        "CMAKE_INSTALL_LIBDIR": "lib/CMAKE_SYSTEM_PROCESSOR-linux-gnu"
+        "CMAKE_INSTALL_LIBDIR": "lib/CMAKE_SYSTEM_PROCESSOR-linux-gnu",
+        "MOQ_TARGET": "x86_64-unknown-linux-gnu"
       }
     },
     {