diff --git a/ports/webthing-cpp/dependencies.diff b/ports/webthing-cpp/dependencies.diff deleted file mode 100644 index cb1a103698a89c..00000000000000 --- a/ports/webthing-cpp/dependencies.diff +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e8ac94c..027ee22 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,14 +29,7 @@ set(VCPKG_BUILD_TYPE ${CMAKE_BUILD_TYPE}) - message("CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") - message("VCPKG_BUILD_TYPE: ${VCPKG_BUILD_TYPE}") - --find_path(UWEBSOCKETS_INCLUDE_DIRS "uwebsockets/App.h") --message("µWebsockets include dir: ${UWEBSOCKETS_INCLUDE_DIRS}") --if(WIN32) -- find_library(LIBUSOCKETS_STATIC uSockets.lib) --else(WIN32) -- find_library(LIBUSOCKETS_STATIC libuSockets.a) --endif(WIN32) --message(${LIBUSOCKETS_STATIC}) -+find_package(unofficial-uwebsockets CONFIG REQUIRED) - - find_path(MDNS_INCLUDE_DIRS "mdns.h") - message("mdns include dir: ${MDNS_INCLUDE_DIRS}") -@@ -44,8 +37,6 @@ message("mdns include dir: ${MDNS_INCLUDE_DIRS}") - find_package(mdns REQUIRED) - find_package(nlohmann_json 3.11.2 REQUIRED) - find_package(nlohmann_json_schema_validator REQUIRED) --find_package(libuv REQUIRED NO_MODULE) --find_package(ZLIB REQUIRED) - - if(WT_WITH_SSL) - find_package(OpenSSL REQUIRED) -@@ -68,5 +59,10 @@ target_include_directories(webthing-cpp INTERFACE - $ - $ - ) -+target_link_libraries(webthing-cpp INTERFACE -+ nlohmann_json_schema_validator::validator -+ nlohmann_json::nlohmann_json -+ unofficial::uwebsockets::uwebsockets -+) - - install(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_PREFIX}/include") diff --git a/ports/webthing-cpp/portfile.cmake b/ports/webthing-cpp/portfile.cmake index 1e1dadc1a0cc85..7cb89d8ba318a6 100644 --- a/ports/webthing-cpp/portfile.cmake +++ b/ports/webthing-cpp/portfile.cmake @@ -4,10 +4,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bw-hro/webthing-cpp REF "v${VERSION}" - SHA512 a4df3424721542ea4a7951ffc643905d31d906bcf87bed613b422ba8c0babb406f842459ba6c6df73c332c70c6fdd639413dc42272fd3b27fdf96b2cee528d36 + SHA512 f4b854d9d363c4b3590232da31a150b3b4a3fb9150cd32558240b02ccf9c8453e79d2330c04076332927c5d488cc5b09ff28a40f225af21f52bd1eac7a4c421a HEAD_REF master - PATCHES - dependencies.diff ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/webthing-cpp/usage b/ports/webthing-cpp/usage index 5e4ea63d3ef24a..47ba6281db3a03 100644 --- a/ports/webthing-cpp/usage +++ b/ports/webthing-cpp/usage @@ -3,3 +3,11 @@ webthing-cpp is header-only and can be used from CMake via: find_path(WEBTHING_CPP_INCLUDE_DIRS "bw/webthing/webthing.hpp") target_include_directories(main PRIVATE ${WEBTHING_CPP_INCLUDE_DIRS}) + +However it requires + + find_package(nlohmann_json_schema_validator CONFIG REQUIRED) + target_link_libraries(main PRIVATE nlohmann_json_schema_validator::validator) + + find_package(unofficial-uwebsockets CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::uwebsockets::uwebsockets) diff --git a/ports/webthing-cpp/vcpkg.json b/ports/webthing-cpp/vcpkg.json index 9a9a7e18f25942..fd035eee26b3fd 100644 --- a/ports/webthing-cpp/vcpkg.json +++ b/ports/webthing-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "webthing-cpp", - "version": "1.0.5", - "port-version": 1, + "version": "1.2.0", "description": "Webthing-CPP is a modern CPP/C++17 implementation of the WebThings API.", "homepage": "https://github.com/bw-hro/webthing-cpp", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 60c6e5a2a55a16..3c7bb90a60299a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9845,8 +9845,8 @@ "port-version": 4 }, "webthing-cpp": { - "baseline": "1.0.5", - "port-version": 1 + "baseline": "1.2.0", + "port-version": 0 }, "webui": { "baseline": "2.4.2", diff --git a/versions/w-/webthing-cpp.json b/versions/w-/webthing-cpp.json index 3ab375471ff349..77c05660984856 100644 --- a/versions/w-/webthing-cpp.json +++ b/versions/w-/webthing-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "766ddcbabb2929320cfbe5788ce0a3bea58037e6", + "version": "1.2.0", + "port-version": 0 + }, { "git-tree": "dceca0241738ad48d83db43f70d0884d83ab6e3d", "version": "1.0.5",