Skip to content

Commit f229ecb

Browse files
oatpp-swagger: Added version 1.3.0.latest (#26921)
* oatpp-swagger: Added version 1.3.0.latest Also, fixed recipe by adding transitive headers from oatpp. * oatpp-swagger: Removed `shared` option Oat++ is not meant to be built as a shared library, cf. https://oatpp.io/docs/installation/unix-linux/#installation-cmake-options * Revert "oatpp-swagger: Removed `shared` option" This reverts commit 59fbfea. * oatpp-swagger: Set transitive_libs for oatpp dependency * Update recipes/oatpp-swagger/all/conanfile.py * Update recipes/oatpp-swagger/all/conanfile.py * Update recipes/oatpp-swagger/all/conanfile.py --------- Co-authored-by: Francisco Ramírez <[email protected]>
1 parent b335cdc commit f229ecb

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

recipes/oatpp-swagger/all/conandata.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
sources:
2+
"1.3.0.latest":
3+
url: "https://github.com/oatpp/oatpp-swagger/archive/1.3.0-latest.tar.gz"
4+
sha256: "cab6eb35b2ebe217c799521abf7b964995d9fa09670ee086ff6ad690fe8ee693"
25
"1.3.0":
36
url: "https://github.com/oatpp/oatpp-swagger/archive/1.3.0.tar.gz"
47
sha256: "4d8db6d73095a786a521a71e8ba6b535fea62237faaaa57d98257312627d3a45"

recipes/oatpp-swagger/all/conanfile.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ class OatppSwaggerConan(ConanFile):
2828
"fPIC": True,
2929
}
3030

31+
@property
32+
def _version(self):
33+
return self.version.split(".latest")[0]
34+
3135
def config_options(self):
3236
if self.settings.os == "Windows":
3337
del self.options.fPIC
@@ -43,7 +47,7 @@ def layout(self):
4347
cmake_layout(self, src_folder="src")
4448

4549
def requirements(self):
46-
self.requires(f"oatpp/{self.version}")
50+
self.requires(f"oatpp/{self.version}", transitive_headers=True, transitive_libs=True)
4751

4852
def validate(self):
4953
if self.info.settings.compiler.get_safe("cppstd"):
@@ -87,11 +91,11 @@ def package_info(self):
8791
self.cpp_info.set_property("cmake_target_name", "oatpp::oatpp-swagger")
8892
# TODO: back to global scope in conan v2 once legacy generators removed
8993
self.cpp_info.components["_oatpp-swagger"].includedirs = [
90-
os.path.join("include", f"oatpp-{self.version}", "oatpp-swagger")
94+
os.path.join("include", f"oatpp-{self._version}", "oatpp-swagger")
9195
]
92-
self.cpp_info.components["_oatpp-swagger"].libdirs = [os.path.join("lib", f"oatpp-{self.version}")]
96+
self.cpp_info.components["_oatpp-swagger"].libdirs = [os.path.join("lib", f"oatpp-{self._version}")]
9397
if self.settings.os == "Windows" and self.options.shared:
94-
self.cpp_info.components["_oatpp-swagger"].bindirs = [os.path.join("bin", f"oatpp-{self.version}")]
98+
self.cpp_info.components["_oatpp-swagger"].bindirs = [os.path.join("bin", f"oatpp-{self._version}")]
9599
else:
96100
self.cpp_info.components["_oatpp-swagger"].bindirs = []
97101
self.cpp_info.components["_oatpp-swagger"].libs = ["oatpp-swagger"]

recipes/oatpp-swagger/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
versions:
2+
"1.3.0.latest":
3+
folder: all
24
"1.3.0":
35
folder: all
46
"1.2.5":

0 commit comments

Comments
 (0)