diff --git a/3rdparty/libremidi b/3rdparty/libremidi index 350c3da4e61..f2e994b5161 160000 --- a/3rdparty/libremidi +++ b/3rdparty/libremidi @@ -1 +1 @@ -Subproject commit 350c3da4e612bf39ef252120bd4f8a9bd67710c5 +Subproject commit f2e994b516198cc4e9eb54486441790533f9f428 diff --git a/3rdparty/oscpack b/3rdparty/oscpack index 0cf0e5011de..bf3d46b3560 160000 --- a/3rdparty/oscpack +++ b/3rdparty/oscpack @@ -1 +1 @@ -Subproject commit 0cf0e5011dea282e60119be1d829a1f5380e5804 +Subproject commit bf3d46b35604c4f576dceef28287c438c1e836a3 diff --git a/3rdparty/rapidfuzz-cpp b/3rdparty/rapidfuzz-cpp index 87ee0dd6128..10426d24cd7 160000 --- a/3rdparty/rapidfuzz-cpp +++ b/3rdparty/rapidfuzz-cpp @@ -1 +1 @@ -Subproject commit 87ee0dd61289fa6d7d0d2b5716f5363ee6b38fb7 +Subproject commit 10426d24cd7479df0fe8c78b17877e756e1c3cd5 diff --git a/cmake/deps/coap.cmake b/cmake/deps/coap.cmake index d095e3a3425..bc3a9c64ea7 100644 --- a/cmake/deps/coap.cmake +++ b/cmake/deps/coap.cmake @@ -28,6 +28,8 @@ if(NOT TARGET libcoap::coap-3) set(_oldmode ${BUILD_SHARED_LIBS}) set(BUILD_SHARED_LIBS OFF) + set(ENABLE_WS ON) + set(ENABLE_WS ON CACHE INTERNAL "") set(ENABLE_DTLS OFF) set(ENABLE_DTLS OFF CACHE INTERNAL "") set(ENABLE_EXAMPLES OFF) diff --git a/cmake/deps/re2.cmake b/cmake/deps/re2.cmake index 5274bc21151..17ba333a7a0 100644 --- a/cmake/deps/re2.cmake +++ b/cmake/deps/re2.cmake @@ -1,15 +1,19 @@ if(OSSIA_USE_SYSTEM_LIBRARIES) - find_library(RE2_LIBRARY NAMES re2) - find_path(RE2_INCLUDE_DIR re2/re2.h) + find_package(re2 QUIET CONFIG) + if(NOT TARGET re2::re2) + message(FATAL_ERROR yo) + find_library(RE2_LIBRARY NAMES re2) + find_path(RE2_INCLUDE_DIR re2/re2.h) - if(NOT RE2_LIBRARY OR NOT RE2_INCLUDE_DIR) - message(FATAL_ERROR "re2 is required") - endif() - add_library(re2 INTERFACE IMPORTED GLOBAL) - add_library(re2::re2 ALIAS re2) + if(NOT RE2_LIBRARY OR NOT RE2_INCLUDE_DIR) + message(FATAL_ERROR "re2 is required") + endif() + add_library(re2 INTERFACE IMPORTED GLOBAL) + add_library(re2::re2 ALIAS re2) - target_include_directories(re2 SYSTEM INTERFACE "${RE2_INCLUDE_DIR}") - target_link_libraries(re2 INTERFACE "${RE2_LIBRARY}") + target_include_directories(re2 SYSTEM INTERFACE "${RE2_INCLUDE_DIR}") + target_link_libraries(re2 INTERFACE "${RE2_LIBRARY}") + endif() else() add_library(re2 STATIC ${OSSIA_3RDPARTY_FOLDER}/re2/re2/bitmap256.cc