[ci] Minimal CMake & build fixes

ossia · Jun 27, 2024 · 1d6de19 · 1d6de19
1 parent 8d73790
commit 1d6de19
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/3rdparty/verdigris b/3rdparty/verdigris
diff --git a/cmake/OssiaOptions.cmake b/cmake/OssiaOptions.cmake
@@ -57,6 +57,7 @@ option(OSSIA_PROTOCOL_OSC "Enable OSC protocol" ON)
 option(OSSIA_PROTOCOL_MINUIT "Enable Minuit protocol" ON)
 option(OSSIA_PROTOCOL_OSCQUERY "Enable OSCQuery protocol" ON)
 option(OSSIA_PROTOCOL_MQTT5 "Enable MQTT 5 protocol" ON)
+option(OSSIA_PROTOCOL_COAP "Enable CoAP protocol" ON)
 option(OSSIA_PROTOCOL_HTTP "Enable HTTP protocol" ON) # Requires Qt
 option(OSSIA_PROTOCOL_WEBSOCKETS "Enable WebSockets protocol" OFF) # Requires Qt
 option(OSSIA_PROTOCOL_SERIAL "Enable Serial port protocol" OFF) # Requires Qt
@@ -70,7 +71,7 @@ option(OSSIA_PROTOCOL_LIBMAPPER "Enable libmapper protocol" OFF) #use external l
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES ".*Clang")
   set(OSSIA_COMPILER_IS_CLANG 1)
   set(OSSIA_COMPILER_IS_NOT_CLANG 0)
-elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Emscripten")
+elseif(EMSCRIPTEN)
   set(OSSIA_COMPILER_IS_CLANG 1)
   set(OSSIA_COMPILER_IS_NOT_CLANG 0)
 else()
@@ -89,6 +90,7 @@ set(OSSIA_AVAILABLE_PROTOCOLS
   ARTNET
   LIBMAPPER
   MQTT5
+  COAP
 )
 
 set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${PROJECT_SOURCE_DIR}/CMake;${PROJECT_SOURCE_DIR}/cmake/cmake-modules;")

diff --git a/src/ossia/dataflow/execution/local_state_execution_policy.hpp b/src/ossia/dataflow/execution/local_state_execution_policy.hpp
@@ -5,9 +5,7 @@
 #include <ossia/detail/audio_spin_mutex.hpp>
 #include <ossia/detail/hash_map.hpp>
 
-#if defined(OSSIA_SMALL_VECTOR)
 #include <libremidi/message.hpp>
-#endif
 
 namespace ossia
 {

diff --git a/src/ossia_features.cmake b/src/ossia_features.cmake
@@ -16,7 +16,7 @@ int main(){ std::shared_mutex t; }
 )
 
 ### Protocol setup ###
-if(IOS OR CMAKE_SYSTEM_NAME MATCHES Emscripten)
+if(IOS OR EMSCRIPTEN)
   set(OSSIA_PROTOCOL_AUDIO TRUE CACHE INTERNAL "")
   set(OSSIA_PROTOCOL_MIDI TRUE CACHE INTERNAL "")
   set(OSSIA_PROTOCOL_HTTP FALSE CACHE INTERNAL "")
@@ -25,6 +25,7 @@ if(IOS OR CMAKE_SYSTEM_NAME MATCHES Emscripten)
   set(OSSIA_PROTOCOL_ARTNET FALSE CACHE INTERNAL "")
   set(OSSIA_PROTOCOL_MQTT5 FALSE CACHE INTERNAL "")
   set(OSSIA_PROTOCOL_COAP FALSE CACHE INTERNAL "")
+  set(OSSIA_PROTOCOL_MQTT5 FALSE CACHE INTERNAL "")
 endif()
 
 if(NOT OSSIA_QML)