[oatpp-zli] add missing deps (#33605)

This commit is contained in:
autoantwort 2023-09-14 00:30:41 +02:00 committed by GitHub
parent 36bd94b598
commit c36b0be6a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 60 additions and 5 deletions

View File

@ -0,0 +1,13 @@
diff --git a/cmake/module-utils.cmake b/cmake/module-utils.cmake
index 8f1d35a..cade49d 100644
--- a/cmake/module-utils.cmake
+++ b/cmake/module-utils.cmake
@@ -5,7 +5,7 @@ macro(target_link_oatpp target)
message("target_link_oatpp(${target}) to installed oatpp lib")
target_link_libraries(${target}
- PRIVATE oatpp::oatpp
+ PUBLIC oatpp::oatpp
PRIVATE oatpp::oatpp-test
)

View File

@ -0,0 +1,14 @@
diff --git a/cmake/module-config.cmake.in b/cmake/module-config.cmake.in
index 5cc12b0..71f8f10 100644
--- a/cmake/module-config.cmake.in
+++ b/cmake/module-config.cmake.in
@@ -1,5 +1,9 @@
@PACKAGE_INIT@
+include(CMakeFindDependencyMacro)
+find_dependency(oatpp)
+find_dependency(ZLIB)
+
if(NOT TARGET oatpp::@OATPP_MODULE_NAME@)
include("${CMAKE_CURRENT_LIST_DIR}/@OATPP_MODULE_NAME@Targets.cmake")
endif()

View File

@ -8,6 +8,9 @@ vcpkg_from_github(
REF ${OATPP_VERSION} REF ${OATPP_VERSION}
SHA512 574f0440cbb2cd2bc14ad89e33538a1a300ad23ecc941629b74aa8ccb9aeae5158b1b57e2f1af09d7a6b9b97430a5685354677002dab2261120afa9c6ea74381 SHA512 574f0440cbb2cd2bc14ad89e33538a1a300ad23ecc941629b74aa8ccb9aeae5158b1b57e2f1af09d7a6b9b97430a5685354677002dab2261120afa9c6ea74381
HEAD_REF master HEAD_REF master
PATCHES
missing-find_dependency.patch
fix-usage.patch
) )
vcpkg_cmake_configure( vcpkg_cmake_configure(

View File

@ -1,7 +1,7 @@
{ {
"name": "oatpp-zlib", "name": "oatpp-zlib",
"version": "1.3.0", "version": "1.3.0",
"port-version": 1, "port-version": 2,
"description": "Oat++ functionality for automatically compressing/decompressing content with deflate and gzip.", "description": "Oat++ functionality for automatically compressing/decompressing content with deflate and gzip.",
"homepage": "https://github.com/oatpp/oatpp-zlib", "homepage": "https://github.com/oatpp/oatpp-zlib",
"license": "Apache-2.0", "license": "Apache-2.0",
@ -14,6 +14,7 @@
{ {
"name": "vcpkg-cmake-config", "name": "vcpkg-cmake-config",
"host": true "host": true
} },
"zlib"
] ]
} }

View File

@ -0,0 +1,12 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 13cccc2c..c4a3fe44 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -301,6 +301,7 @@ set_target_properties(oatpp PROPERTIES
CXX_EXTENSIONS OFF
CXX_STANDARD_REQUIRED ON
)
+target_compile_features(oatpp PUBLIC cxx_std_11)
if (MSVC)
target_compile_options(oatpp PRIVATE /permissive-)
endif()

View File

@ -8,6 +8,8 @@ vcpkg_from_github(
REF ${OATPP_VERSION} REF ${OATPP_VERSION}
SHA512 4fe8587efe1b4ecae14554ec8edb209e5558a3e4a4e6ff49bbfaaf06d2cc12f2cc306c5edc43b8dafc465aff53098ad4bebb9971694761b91a553730d5acb59a SHA512 4fe8587efe1b4ecae14554ec8edb209e5558a3e4a4e6ff49bbfaaf06d2cc12f2cc306c5edc43b8dafc465aff53098ad4bebb9971694761b91a553730d5acb59a
HEAD_REF master HEAD_REF master
PATCHES
fix-target.patch
) )
if (VCPKG_CRT_LINKAGE STREQUAL "static") if (VCPKG_CRT_LINKAGE STREQUAL "static")

View File

@ -1,7 +1,7 @@
{ {
"name": "oatpp", "name": "oatpp",
"version": "1.3.0", "version": "1.3.0",
"port-version": 1, "port-version": 2,
"description": "Modern web framework.", "description": "Modern web framework.",
"homepage": "https://github.com/oatpp/oatpp", "homepage": "https://github.com/oatpp/oatpp",
"license": "Apache-2.0", "license": "Apache-2.0",

View File

@ -5854,7 +5854,7 @@
}, },
"oatpp": { "oatpp": {
"baseline": "1.3.0", "baseline": "1.3.0",
"port-version": 1 "port-version": 2
}, },
"oatpp-consul": { "oatpp-consul": {
"baseline": "1.3.0", "baseline": "1.3.0",
@ -5902,7 +5902,7 @@
}, },
"oatpp-zlib": { "oatpp-zlib": {
"baseline": "1.3.0", "baseline": "1.3.0",
"port-version": 1 "port-version": 2
}, },
"observer-ptr-lite": { "observer-ptr-lite": {
"baseline": "0.4.0", "baseline": "0.4.0",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "d73da3c88835636ace280c7a29fa13fbcde0b2d8",
"version": "1.3.0",
"port-version": 2
},
{ {
"git-tree": "0f40812d2446d50d41add9deba46e0baa042ac53", "git-tree": "0f40812d2446d50d41add9deba46e0baa042ac53",
"version": "1.3.0", "version": "1.3.0",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "36f425ca9c764945b824bfe5ff506fe09a5361d8",
"version": "1.3.0",
"port-version": 2
},
{ {
"git-tree": "f3700f7d93bbb8922878c25705d0e00cd7049066", "git-tree": "f3700f7d93bbb8922878c25705d0e00cd7049066",
"version": "1.3.0", "version": "1.3.0",