diff --git a/ports/coinbase-advanced-cpp/disable-config-fetchcontent-fallback.patch b/ports/coinbase-advanced-cpp/disable-config-fetchcontent-fallback.patch index 2028165672..19180db201 100644 --- a/ports/coinbase-advanced-cpp/disable-config-fetchcontent-fallback.patch +++ b/ports/coinbase-advanced-cpp/disable-config-fetchcontent-fallback.patch @@ -1,69 +1,27 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 998f666..2738a32 100644 +index c4148db..ccabb6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -21,15 +21,15 @@ find_package(nlohmann_json CONFIG REQUIRED) +@@ -21,8 +21,8 @@ find_package(nlohmann_json CONFIG REQUIRED) find_package(OpenSSL CONFIG REQUIRED) find_package(jwt-cpp CONFIG REQUIRED) --find_package(slick-net 3.0.0 CONFIG QUIET) +-find_package(slick-net 3.1.0 CONFIG QUIET) -if (NOT slick-net_FOUND) -- message(STATUS "fetching slick-net...") -- include(FetchContent) -- set(BUILD_SLICK_NET_EXAMPLES OFF CACHE BOOL "" FORCE) -- set(BUILD_SLICK_NET_TESTS OFF CACHE BOOL "" FORCE) -- FetchContent_Declare( -- slick-net -- GIT_REPOSITORY https://github.com/SlickQuant/slick-net.git -+find_package(slick-net 3.0.0 CONFIG REQUIRED) ++find_package(slick-net CONFIG REQUIRED) +if (FALSE) -+ message(STATUS "fetching slick-net...") -+ include(FetchContent) -+ set(BUILD_SLICK_NET_EXAMPLES OFF CACHE BOOL "" FORCE) -+ set(BUILD_SLICK_NET_TESTS OFF CACHE BOOL "" FORCE) -+ FetchContent_Declare( -+ slick-net -+ GIT_REPOSITORY https://github.com/SlickQuant/slick-net.git - GIT_TAG v3.0.0 - ) - FetchContent_MakeAvailable(slick-net) -@@ -50,7 +50,7 @@ target_include_directories(coinbase-advanced-cpp PUBLIC - $ - $ - ) --target_link_libraries(coinbase-advanced-cpp PUBLIC slick::net jwt-cpp::jwt-cpp) -+target_link_libraries(coinbase-advanced-cpp PUBLIC slick::net jwt-cpp::jwt-cpp) - - # PRIVATE precompiled headers for faster static library compilation - target_precompile_headers(coinbase-advanced-cpp PRIVATE + message(STATUS "fetching slick-net...") + include(FetchContent) + set(BUILD_SLICK_NET_EXAMPLES OFF CACHE BOOL "" FORCE) diff --git a/cmake/coinbase-advanced-cppConfig.cmake.in b/cmake/coinbase-advanced-cppConfig.cmake.in -index dfd8267..0cf7b1f 100644 +index bb101f7..0cf7b1f 100644 --- a/cmake/coinbase-advanced-cppConfig.cmake.in +++ b/cmake/coinbase-advanced-cppConfig.cmake.in -@@ -2,23 +2,10 @@ - - include(CMakeFindDependencyMacro) - --find_dependency(nlohmann_json CONFIG REQUIRED) --find_dependency(OpenSSL CONFIG REQUIRED) --find_dependency(jwt-cpp CONFIG REQUIRED) -- --find_dependency(slick-net 3.0.0 CONFIG QUIET) --if(NOT slick-net_FOUND) -- message(STATUS "Fetching slick-net...") -- include(FetchContent) -- set(BUILD_SLICK_NET_EXAMPLES OFF CACHE BOOL "" FORCE) -- set(BUILD_SLICK_NET_TESTS OFF CACHE BOOL "" FORCE) -- FetchContent_Declare( -- slick-net -- GIT_REPOSITORY https://github.com/SlickQuant/slick-net.git -- GIT_TAG v3.0.0 -- ) -- FetchContent_MakeAvailable(slick-net) --endif() -+find_dependency(nlohmann_json CONFIG) -+find_dependency(OpenSSL CONFIG) -+find_dependency(jwt-cpp CONFIG) +@@ -5,7 +5,7 @@ include(CMakeFindDependencyMacro) + find_dependency(nlohmann_json CONFIG) + find_dependency(OpenSSL CONFIG) + find_dependency(jwt-cpp CONFIG) +-find_dependency(slick-net 3.0.0 CONFIG) +find_dependency(slick-net CONFIG) include("${CMAKE_CURRENT_LIST_DIR}/coinbase-advanced-cppTargets.cmake") diff --git a/ports/coinbase-advanced-cpp/portfile.cmake b/ports/coinbase-advanced-cpp/portfile.cmake index 585a93f006..44bb7cea90 100644 --- a/ports/coinbase-advanced-cpp/portfile.cmake +++ b/ports/coinbase-advanced-cpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SlickQuant/coinbase-advanced-cpp REF "v${VERSION}" - SHA512 6d7425668a1f7c0517bd766f61fb9e4e2223ec5b2946934d2667ddd07c25b5d788b22bbbbabd761dd06394b9de491c5cc05effd5c77595423d5063ae244f1d38 + SHA512 b938d9dd0b1b0a6de0bc33b8c8003d1594a294fc81b9a42c4f1cf4b254a261e42f91df8dbb07ad586f642e524b67ea3bca07652e8dc3aca2df9d4ca9fda5959b HEAD_REF main PATCHES disable-config-fetchcontent-fallback.patch # also https://github.com/SlickQuant/coinbase-advanced-cpp/pull/1 diff --git a/ports/coinbase-advanced-cpp/vcpkg.json b/ports/coinbase-advanced-cpp/vcpkg.json index 71cf0ab99f..ad5832de64 100644 --- a/ports/coinbase-advanced-cpp/vcpkg.json +++ b/ports/coinbase-advanced-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "coinbase-advanced-cpp", - "version": "1.0.0", + "version": "1.0.1", "description": "C++20 SDK for the Coinbase Advanced API (REST + WebSocket).", "homepage": "https://github.com/SlickQuant/coinbase-advanced-cpp", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 49850a229e..7a02b14f71 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1921,7 +1921,7 @@ "port-version": 1 }, "coinbase-advanced-cpp": { - "baseline": "1.0.0", + "baseline": "1.0.1", "port-version": 0 }, "coinutils": { diff --git a/versions/c-/coinbase-advanced-cpp.json b/versions/c-/coinbase-advanced-cpp.json index f9766e98cd..bd0dd5ab23 100644 --- a/versions/c-/coinbase-advanced-cpp.json +++ b/versions/c-/coinbase-advanced-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68e51cce3495fda41c4b9614a96765ad13d0fb11", + "version": "1.0.1", + "port-version": 0 + }, { "git-tree": "cecf48d1ba0e92996783777734fa6b453eb1ef14", "version": "1.0.0",