Update for newer version of clap-helpers & include them via cmake

.github/workflows/pullreq.yml

@@ -39,7 +39,7 @@ jobs:
 
       - name: Build project
         run: |
-          cmake -S . -B ./build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCLAP_SDK_ROOT=deps/clap -DVST3_SDK_ROOT=deps/vst3sdk -DCLAP_WRAPPER_OUTPUT_NAME=testplug
+          cmake -S . -B ./build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCLAP_SDK_ROOT=deps/clap -DCLAP_HELPERS_SDK_ROOT=deps/clap-helpers -DVST3_SDK_ROOT=deps/vst3sdk -DCLAP_WRAPPER_OUTPUT_NAME=testplug
           cmake --build ./build --config Debug
 
       - name: Show Build Results

CMakeLists.txt

@@ -10,6 +10,7 @@
 # complete description
 #
 # CLAP_SDK_ROOT The location of the clap library. Defaults to ../clap
+# CLAP_HELPERS_SDK_ROOT The location of the clap-helpers library. Defaults to ../clap-helpers
 # VST3_SDK_ROOT The location of the VST3 sdk. Defaults tp ../vst3sdk
 #
 # CLAP_WRAPPER_OUTPUT_NAME   The name of the resulting .vst3 or .component

README.md

@@ -48,6 +48,7 @@ git clone https://github.com/free-audio/clap-wrapper.git
 mkdir build
 cmake -B build \ 
       -DCLAP_SDK_ROOT={path to clap sdk} \
+      -DCLAP_HELPERS_SDK_ROOT={path to clap-helpers sdk} \
       -DVST3_SDK_ROOT={path to vst3 sdk} \
       -DCLAP_WRAPPER_OUTPUT_NAME="The Name of your CLAP"
 ```

cmake/base_sdks.cmake

@@ -91,6 +91,41 @@ function(guarantee_clap)
     add_subdirectory(${CLAP_SDK_ROOT} base-sdk-clap EXCLUDE_FROM_ALL)
 endfunction(guarantee_clap)
 
+function(guarantee_clap_helpers)
+    if (TARGET clap-helpers)
+        if (NOT TARGET base-sdk-clap-helpers)
+            add_library(base-sdk-clap-helpers ALIAS clap-helpers)
+        endif()
+        return()
+    endif()
+
+
+    if (NOT "${CLAP_HELPERS_SDK_ROOT}" STREQUAL "")
+        # Use the provided root
+    elseif (${CLAP_WRAPPER_DOWNLOAD_DEPENDENCIES})
+        guarantee_cpm()
+        CPMAddPackage(
+                NAME "clap-helpers"
+                GITHUB_REPOSITORY "free-audio/clap-helpers"
+                GIT_TAG "64ee8eddea392da7f9db04b409fce69f9248a474"
+                EXCLUDE_FROM_ALL TRUE
+                DOWNLOAD_ONLY TRUE
+                SOURCE_DIR cpm/clap-helpers
+        )
+        set(CLAP_HELPERS_SDK_ROOT "${CMAKE_CURRENT_BINARY_DIR}/cpm/clap-helpers")
+    else()
+        search_for_sdk_source(SDKDIR clap-helpers RESULT CLAP_HELPERS_SDK_ROOT)
+    endif()
+
+    cmake_path(CONVERT "${CLAP_HELPERS_SDK_ROOT}" TO_CMAKE_PATH_LIST CLAP_HELPERS_SDK_ROOT)
+    if(NOT EXISTS "${CLAP_HELPERS_SDK_ROOT}/include/clap/helpers/macros.hh")
+        message(FATAL_ERROR "There is no CLAP_HELPERS SDK at ${CLAP_HELPERS_SDK_ROOT}. Please set CLAP_HELPERS_SDK_ROOT appropriately ")
+    endif()
+
+    message(STATUS "clap-wrapper: Configuring clap-helpers sdk")
+    add_subdirectory(${CLAP_HELPERS_SDK_ROOT} base-sdk-clap-helpers EXCLUDE_FROM_ALL)
+endfunction(guarantee_clap_helpers)
+
 function(guarantee_vst3sdk)
     if (TARGET base-sdk-vst3)
         return()

cmake/shared_prologue.cmake

@@ -142,7 +142,7 @@ function(guarantee_clap_wrapper_shared)
             src/detail/clap/fsutil.cpp
             src/detail/clap/automation.h
             )
-    target_link_libraries(clap-wrapper-shared-detail PUBLIC clap clap-wrapper-extensions clap-wrapper-compile-options)
+    target_link_libraries(clap-wrapper-shared-detail PUBLIC clap clap-helpers clap-wrapper-extensions clap-wrapper-compile-options)
     target_include_directories(clap-wrapper-shared-detail PUBLIC libs/fmt)
     target_include_directories(clap-wrapper-shared-detail PUBLIC src)
 

cmake/wrapper_functions.cmake

@@ -21,6 +21,7 @@ include(cmake/shared_prologue.cmake)
 include(cmake/base_sdks.cmake)
 
 guarantee_clap()
+guarantee_clap_helpers()
 guarantee_clap_wrapper_shared()
 
 

src/clap_proxy.cpp

@@ -1,6 +1,6 @@
 #include "clap_proxy.h"
 #include "detail/clap/fsutil.h"
-#include "detail/clap/helpers/host.hxx"
+#include <clap/helpers/host.hxx>
 #include <cstring>
 
 #if MAC || LIN
@@ -274,7 +274,7 @@ void Plugin::logLog(clap_log_severity severity, const char* msg) const noexcept
 #endif
 }
 
-bool Plugin::threadCheckIsMainThread() noexcept
+bool Plugin::threadCheckIsMainThread() const noexcept
 {
   if (this->_main_thread_override > 0)
   {
@@ -283,7 +283,7 @@ bool Plugin::threadCheckIsMainThread() noexcept
   return _main_thread_id == std::this_thread::get_id();
 }
 
-bool Plugin::threadCheckIsAudioThread() noexcept
+bool Plugin::threadCheckIsAudioThread() const noexcept
 {
   if (this->_audio_thread_override > 0)
   {

src/clap_proxy.h

@@ -25,7 +25,7 @@
 #endif
 
 #include "detail/clap/fsutil.h"
-#include "detail/clap/helpers/host.hh"
+#include <clap/helpers/host.hh>
 
 namespace Clap
 {
@@ -232,8 +232,8 @@ class Plugin : Clap::PluginHostBase
   bool timerSupportUnregisterTimer(clap_id timerId) noexcept override;
 
   // clap_host_thread_check
-  bool threadCheckIsMainThread() noexcept override;
-  bool threadCheckIsAudioThread() noexcept override;
+  bool threadCheckIsMainThread() const noexcept override;
+  bool threadCheckIsAudioThread() const noexcept override;
 
  private:
   IHost* _parentHost = nullptr;