Update build system.

Author: FiniteSingularity

CMakeLists.txt

@@ -1,96 +1,51 @@
 cmake_minimum_required(VERSION 3.16...3.26)
 
-# probably best to move this to a seperate file
-function(setup_obs_lib_dependency target)
-  if(BUILD_OUT_OF_TREE)
-    find_package(libobs)
-    if(libobs_FOUND AND NOT LIBOBS_LIB)
-      target_link_libraries(${target} PUBLIC OBS::libobs)
-    else()
-      if(NOT LIBOBS_LIB)
-        message(FATAL_ERROR "obs library not found - please set LIBOBS_LIB")
-      endif()
-      target_link_libraries(${target} PUBLIC ${LIBOBS_LIB})
-      if(NOT LIBOBS_INCLUDE_DIR)
-        message(FATAL_ERROR "obs.hpp header not found - please set LIBOBS_INCLUDE_DIR")
-      endif()
-      target_include_directories(${target} PRIVATE ${LIBOBS_INCLUDE_DIR})
-    endif()
-    find_package(obs-frontend-api)
-    if(obs-frontend-api_FOUND AND NOT LIBOBS_FRONTEND_API_LIB)
-      target_link_libraries(${target} PUBLIC OBS::obs-frontend-api)
-    else()
-      if(NOT LIBOBS_FRONTEND_API_LIB)
-        message(FATAL_ERROR "libobs frontend-api library not found - please set LIBOBS_FRONTEND_API_LIB")
-      endif()
-      target_link_libraries(${target} PUBLIC ${LIBOBS_FRONTEND_API_LIB})
-      if(NOT LIBOBS_FRONTEND_INCLUDE_DIR)
-        message(FATAL_ERROR " obs-frontend-api.h not found - please set LIBOBS_FRONTEND_INCLUDE_DIR")
-      endif()
-      target_include_directories(${target} PRIVATE ${LIBOBS_FRONTEND_INCLUDE_DIR})
-    endif()
-  else()
-    target_link_libraries(${target} PUBLIC OBS::libobs OBS::frontend-api)
-  endif()
-endfunction()
+include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/common/bootstrap.cmake" NO_POLICY_SCOPE)
 
-project(elgato-marketplace VERSION 0.0.8)
-
-if(${CMAKE_PROJECT_NAME} STREQUAL "obs-studio")
-  set(OBS_FRONTEND_API_NAME "frontend-api")
-  if(NOT DEFINED BUILD_OUT_OF_TREE)
-    message(STATUS "${PROJECT_NAME} configured for in-tree build")
-  endif()
-else()
-  set(BUILD_OUT_OF_TREE ON)
-  set(OBS_FRONTEND_API_NAME "obs-frontend-api")
-  message(STATUS "${PROJECT_NAME} configured for out-of-tree build")
-endif()
-
-if(BUILD_OUT_OF_TREE)
-  include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/common/bootstrap.cmake" NO_POLICY_SCOPE)
-  include(compilerconfig)
-  include(defaults)
-endif()
-include(helpers)
+project(${_name} VERSION ${_version})
 
 option(ENABLE_FRONTEND_API "Use obs-frontend-api for UI functionality" OFF)
 option(ENABLE_QT "Use Qt functionality" OFF)
 
-add_library(${PROJECT_NAME} MODULE)
+include(compilerconfig)
+include(defaults)
+include(helpers)
 
-if(BUILD_OUT_OF_TREE)
-  find_package(${OBS_FRONTEND_API_NAME} REQUIRED)
-endif()
+add_library(${CMAKE_PROJECT_NAME} MODULE)
 
-target_link_libraries(${PROJECT_NAME} PRIVATE OBS::${OBS_FRONTEND_API_NAME})
+find_package(libobs REQUIRED)
+target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE OBS::libobs)
 
-find_package(Qt6 COMPONENTS Widgets Core Concurrent)
-target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Core Qt6::Widgets Qt6::Concurrent)
-target_compile_options(${PROJECT_NAME}
-                       PRIVATE $<$<C_COMPILER_ID:Clang,AppleClang>:-Wno-quoted-include-in-framework-header -Wno-comma>)
+if(ENABLE_FRONTEND_API)
+  find_package(obs-frontend-api REQUIRED)
+  target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE OBS::obs-frontend-api)
+endif()
 
-set_target_properties(
-  ${PROJECT_NAME}
-  PROPERTIES AUTOMOC ON
-             AUTOUIC ON
-             AUTORCC ON)
+if(ENABLE_QT)
+  find_qt(COMPONENTS Widgets Core Concurrent)
+  target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Qt::Core Qt::Widgets Qt::Concurrent)
+  target_compile_options(
+    ${CMAKE_PROJECT_NAME} PRIVATE $<$<C_COMPILER_ID:Clang,AppleClang>:-Wno-quoted-include-in-framework-header
+                                  -Wno-comma>)
+  set_target_properties(
+    ${CMAKE_PROJECT_NAME}
+    PROPERTIES AUTOMOC ON
+               AUTOUIC ON
+               AUTORCC ON)
+endif()
 
 find_package(CURL REQUIRED)
-# find_package(ZLIB REQUIRED)
 find_package(nlohmann_json REQUIRED)
 
-target_link_libraries(${PROJECT_NAME} PRIVATE CURL::libcurl nlohmann_json::nlohmann_json)
+target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE CURL::libcurl nlohmann_json::nlohmann_json)
 
 target_sources(
-  ${PROJECT_NAME}
+  ${CMAKE_PROJECT_NAME}
   PRIVATE src/plugin-module.cpp
           src/elgato-styles.hpp
           src/zip_file.hpp
           src/api.cpp
           src/api.hpp
-          src/plugin-support.c
-          src/plugin-support.h
           src/platform.cpp
           src/platform.h
           src/util.cpp
@@ -123,23 +78,7 @@ target_sources(
           src/elgato-widgets.cpp
           src/elgato-widgets.hpp)
 
-target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src")
-
-add_executable(${PROJECT_NAME}-loader loader/main.cpp)
-
-install(TARGETS ${PROJECT_NAME}-loader RUNTIME DESTINATION data/obs-plugins/${PROJECT_NAME})
+add_executable(${CMAKE_PROJECT_NAME}-loader loader/main.cpp)
+install(TARGETS ${CMAKE_PROJECT_NAME}-loader RUNTIME DESTINATION data/obs-plugins/${CMAKE_PROJECT_NAME})
 
-setup_obs_lib_dependency(${PROJECT_NAME})
-if(BUILD_OUT_OF_TREE)
-  set_target_properties_plugin(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${_name})
-else()
-  set_target_properties_obs(${PROJECT_NAME} PROPERTIES FOLDER "plugins/elgato" PREFIX "")
-endif()
-
-if(BUILD_OUT_OF_TREE)
-  if(OS_WINDOWS)
-    set(OBS_PLUGIN_DESTINATION "obs-plugins/64bit")
-  else()
-    set(OBS_PLUGIN_DESTINATION "${CMAKE_INSTALL_LIBDIR}/obs-plugins")
-  endif()
-endif()
+set_target_properties_plugin(${CMAKE_PROJECT_NAME} PROPERTIES OUTPUT_NAME ${_name})

CMakePresets.json

@@ -6,19 +6,10 @@
     "patch": 0
   },
   "configurePresets": [
-    {
-      "name": "template",
-      "hidden": true,
-      "cacheVariables": {
-        "ENABLE_FRONTEND_API": true,
-        "ENABLE_QT": true
-      }
-    },
     {
       "name": "macos",
       "displayName": "macOS Universal",
       "description": "Build for macOS 11.0+ (Universal binary)",
-      "inherits": ["template"],
       "binaryDir": "${sourceDir}/build_macos",
       "condition": {
         "type": "equals",
@@ -28,9 +19,12 @@
       "generator": "Xcode",
       "warnings": {"dev": true, "deprecated": true},
       "cacheVariables": {
+        "QT_VERSION": "6",
         "CMAKE_OSX_DEPLOYMENT_TARGET": "11.0",
         "CODESIGN_IDENTITY": "$penv{CODESIGN_IDENT}",
-        "CODESIGN_TEAM": "$penv{CODESIGN_TEAM}"
+        "CODESIGN_TEAM": "$penv{CODESIGN_TEAM}",
+        "ENABLE_FRONTEND_API": true,
+        "ENABLE_QT": true
       }
     },
     {
@@ -47,7 +41,6 @@
       "name": "windows-x64",
       "displayName": "Windows x64",
       "description": "Build for Windows x64",
-      "inherits": ["template"],
       "binaryDir": "${sourceDir}/build_x64",
       "condition": {
         "type": "equals",
@@ -58,7 +51,10 @@
       "architecture": "x64",
       "warnings": {"dev": true, "deprecated": true},
       "cacheVariables": {
-        "CMAKE_SYSTEM_VERSION": "10.0.18363.657"
+        "QT_VERSION": "6",
+        "CMAKE_SYSTEM_VERSION": "10.0.18363.657",
+        "ENABLE_FRONTEND_API": true,
+        "ENABLE_QT": true
       }
     },
     {
@@ -74,7 +70,6 @@
       "name": "linux-x86_64",
       "displayName": "Linux x86_64",
       "description": "Build for Linux x86_64",
-      "inherits": ["template"],
       "binaryDir": "${sourceDir}/build_x86_64",
       "condition": {
         "type": "equals",
@@ -84,7 +79,10 @@
       "generator": "Ninja",
       "warnings": {"dev": true, "deprecated": true},
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+        "QT_VERSION": "6",
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+        "ENABLE_FRONTEND_API": true,
+        "ENABLE_QT": true
       }
     },
     {
@@ -101,7 +99,6 @@
       "name": "linux-aarch64",
       "displayName": "Linux aarch64",
       "description": "Build for Linux aarch64",
-      "inherits": ["template"],
       "binaryDir": "${sourceDir}/build_aarch64",
       "condition": {
         "type": "equals",
@@ -111,7 +108,10 @@
       "generator": "Ninja",
       "warnings": {"dev": true, "deprecated": true},
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+        "QT_VERSION": "6",
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+        "ENABLE_FRONTEND_API": false,
+        "ENABLE_QT": false
       }
     },
     {

build-aux/.run-format.zsh

@@ -29,23 +29,23 @@ invoke_formatter() {
 
   case ${1} {
     clang)
-      if (( ${+commands[clang-format-17]} )) {
-        local formatter=clang-format-17
+      if (( ${+commands[clang-format-16]} )) {
+        local formatter=clang-format-16
       } elif (( ${+commands[clang-format]} )) {
         local formatter=clang-format
         local -a formatter_version=($(clang-format --version))
 
-        if ! is-at-least 17.0.3 ${formatter_version[-1]}; then
-          log_error "clang-format is not version 17.0.3 or above (found ${formatter_version[-1]}."
+        if ! is-at-least 16.0.5 ${formatter_version[-1]}; then
+          log_error "clang-format is not version 16.0.5 or above (found ${formatter_version[-1]}."
           exit 2
         fi
 
-        if ! is-at-least ${formatter_version[-1]} 17.0.3; then
-          log_error "clang-format is more recent than version 17.0.3 (found ${formatter_version[-1]})."
+        if ! is-at-least ${formatter_version[-1]} 16.0.5; then
+          log_error "clang-format is more recent than version 16.0.5 (found ${formatter_version[-1]})."
           exit 2
         fi
       } else {
-        log_error "No viable clang-format version found (required 17.0.3)"
+        log_error "No viable clang-format version found (required 16.0.5)"
         exit 2
       }
 

buildspec.json

@@ -15,9 +15,7 @@
             "label": "Pre-Built obs-deps",
             "hashes": {
                 "macos": "90c2fc069847ec2768dcc867c1c63b112c615ed845a907dc44acab7a97181974",
-                "windows-x64": "d0825a6fb65822c993a3059edfba70d72d2e632ef74893588cf12b1f0d329ce6",
-                "windows-x86": "b69c864275189464483c240ef3f25ea16fba3050b136fe6c3db6e9ee63036683",
-                "linux-x86_64": "9217c6b70854a08575cc3debe85ed5496bb0d8a9de54a1f8148aa71ad71f98d6"
+                "windows-x64": "d0825a6fb65822c993a3059edfba70d72d2e632ef74893588cf12b1f0d329ce6"
             }
         },
         "qt6": {
@@ -38,9 +36,10 @@
             "bundleId": "com.elgato.marketplace-plugin"
         }
     },
-    "name": "elgato-marketplace",
-    "displayName": "Elgato Marketplace Plugin",
-    "version": "0.0.8",
+    "name": "elgato-marketplace-connect",
+    "displayName": "Elgato Marketplace Connect",
+    "version": "1.0.0.123",
+    "releaseLabel": "RC 1",
     "author": "Elgato",
     "website": "https://elgato.com",
     "email": "support@elgato.com",

cmake/common/buildnumber.cmake

@@ -12,14 +12,8 @@ if(NOT DEFINED PLUGIN_BUILD_NUMBER AND EXISTS "${_BUILD_NUMBER_CACHE}")
   file(READ "${_BUILD_NUMBER_CACHE}" PLUGIN_BUILD_NUMBER)
   math(EXPR PLUGIN_BUILD_NUMBER "${PLUGIN_BUILD_NUMBER}+1")
 elseif(NOT DEFINED PLUGIN_BUILD_NUMBER)
-  if($ENV{CI})
-    if($ENV{GITHUB_RUN_ID})
-      set(PLUGIN_BUILD_NUMBER "$ENV{GITHUB_RUN_ID}")
-    elseif($ENV{GITLAB_RUN_ID})
-      set(PLUGIN_BUILD_NUMBER "$ENV{GITLAB_RUN_ID}")
-    else()
-      set(PLUGIN_BUILD_NUMBER "1")
-    endif()
+  if($ENV{CI} AND $ENV{GITHUB_RUN_ID})
+    set(PLUGIN_BUILD_NUMBER "$ENV{GITHUB_RUN_ID}")
   else()
     set(PLUGIN_BUILD_NUMBER "1")
   endif()