Skip to content

Commit 819f1f0

Browse files
authored
Merge branch 'conan-io:master' into master
2 parents 90a0ef1 + a641f7d commit 819f1f0

File tree

128 files changed

+1449
-629
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+1449
-629
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
sources:
2+
"3.9.5":
3+
url: "https://github.com/apache/activemq-cpp/archive/refs/tags/activemq-cpp-3.9.5.tar.gz"
4+
sha256: "3a56b526360155fd920f136b187ffb84942890b9b7e206976c81ef9f2ab2b11b"
Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
import os
2+
3+
from conan import ConanFile
4+
from conan.tools.apple import fix_apple_shared_install_name
5+
from conan.tools.build import check_max_cppstd, check_min_cppstd, cross_building
6+
from conan.tools.env import VirtualRunEnv
7+
from conan.tools.files import copy, get, rm, rmdir
8+
from conan.tools.gnu import Autotools, AutotoolsDeps, AutotoolsToolchain, PkgConfigDeps
9+
from conan.tools.layout import basic_layout
10+
11+
required_conan_version = ">=2.1"
12+
13+
class PackageConan(ConanFile):
14+
name = "activemq-cpp"
15+
description = "JMS-like API for C++ for interfacing with Message Brokers such as Apache ActiveMQ"
16+
license = "Apache-2.0"
17+
url = "https://github.com/conan-io/conan-center-index"
18+
homepage = "https://github.com/apache/activemq-cpp"
19+
topics = ("ruby", "python", "c", "java", "php", "csharp", "cplusplus", "perl", "activemq", "network-server", "network-client")
20+
package_type = "library"
21+
settings = "os", "arch", "compiler", "build_type"
22+
options = {
23+
"shared": [True, False],
24+
"fPIC": [True, False],
25+
}
26+
default_options = {
27+
"shared": False,
28+
"fPIC": True,
29+
}
30+
31+
implements = ["auto_shared_fpic"]
32+
33+
def layout(self):
34+
basic_layout(self, src_folder="src")
35+
36+
def requirements(self):
37+
self.requires("apr/[>=1.3]")
38+
self.requires("apr-util/[>=1.3]")
39+
self.requires("libuuid/[>=1.0.3]")
40+
self.requires("openssl/[>=1.1 <4]")
41+
42+
def validate(self):
43+
check_min_cppstd(self, 11)
44+
check_max_cppstd(self, 14)
45+
46+
def build_requirements(self):
47+
self.tool_requires("libtool/[>=1.5.22]")
48+
49+
def source(self):
50+
get(self, **self.conan_data["sources"][self.version], strip_root=True)
51+
52+
def generate(self):
53+
if not cross_building(self):
54+
VirtualRunEnv(self).generate(scope="build")
55+
tc = AutotoolsToolchain(self)
56+
57+
tc.autoreconf_args.extend(["-I", "config", "-I", "m4"])
58+
if self.options.shared:
59+
tc.configure_args.extend(["--enable-shared"])
60+
61+
apr_package_folder = self.dependencies.direct_host["apr"].package_folder
62+
tc.configure_args.extend([
63+
f"--with-apr={apr_package_folder}"
64+
])
65+
66+
tc.generate()
67+
tc = PkgConfigDeps(self)
68+
tc.generate()
69+
deps = AutotoolsDeps(self)
70+
deps.generate()
71+
72+
def build(self):
73+
autotools = Autotools(self)
74+
75+
script_folder = "activemq-cpp"
76+
77+
autotools.autoreconf(build_script_folder=script_folder)
78+
autotools.configure(build_script_folder=script_folder)
79+
autotools.make()
80+
81+
def package(self):
82+
copy(self, "LICENSE.txt", self.source_folder, os.path.join(self.package_folder, "licenses"))
83+
autotools = Autotools(self)
84+
autotools.install()
85+
86+
rm(self, "*.la", os.path.join(self.package_folder, "lib"))
87+
rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
88+
rmdir(self, os.path.join(self.package_folder, "share"))
89+
90+
fix_apple_shared_install_name(self)
91+
92+
def package_info(self):
93+
self.cpp_info.includedirs = ["include/activemq-cpp-3.9.5"]
94+
self.cpp_info.libs = ["activemq-cpp"]
95+
96+
self.cpp_info.set_property("pkg_config_name", "activemq-cpp")
97+
98+
if self.settings.os in ["Linux", "FreeBSD", "Macos"]:
99+
self.cpp_info.system_libs.extend(["dl", "m", "pthread"])
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
cmake_minimum_required(VERSION 3.15)
2+
project(test_package LANGUAGES CXX)
3+
4+
find_package(activemq-cpp REQUIRED CONFIG)
5+
6+
add_executable(${PROJECT_NAME} test_package.cpp)
7+
target_link_libraries(${PROJECT_NAME} PRIVATE activemq-cpp::activemq-cpp)
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
from conan import ConanFile
2+
from conan.tools.build import can_run
3+
from conan.tools.cmake import cmake_layout, CMake
4+
import os
5+
6+
7+
class TestPackageConan(ConanFile):
8+
settings = "os", "arch", "compiler", "build_type"
9+
generators = "CMakeDeps", "CMakeToolchain"
10+
11+
def layout(self):
12+
cmake_layout(self)
13+
14+
def requirements(self):
15+
self.requires(self.tested_reference_str)
16+
17+
def build(self):
18+
cmake = CMake(self)
19+
cmake.configure()
20+
cmake.build()
21+
22+
def test(self):
23+
if can_run(self):
24+
bin_path = os.path.join(self.cpp.build.bindir, "test_package")
25+
self.run(bin_path, env="conanrun")
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#include <cstdlib>
2+
#include <memory>
3+
#include <activemq/core/ActiveMQConnectionFactory.h>
4+
#include <activemq/library/ActiveMQCPP.h>
5+
#include <cms/Connection.h>
6+
#include <cms/ConnectionFactory.h>
7+
8+
9+
int main(void) {
10+
11+
activemq::library::ActiveMQCPP::initializeLibrary();
12+
13+
activemq::library::ActiveMQCPP::shutdownLibrary();
14+
15+
return EXIT_SUCCESS;
16+
}

recipes/activemq-cpp/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
versions:
2+
"3.9.5":
3+
folder: all

recipes/cassandra-cpp-driver/all/conandata.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
sources:
22
"2.17.1":
3-
url: "https://github.com/datastax/cpp-driver/archive/2.17.1.tar.gz"
4-
sha256: "53b4123aad59b39f2da0eb0ce7fe0e92559f7bba0770b2e958254f17bffcd7cf"
3+
url: "https://github.com/apache/cassandra-cpp-driver/archive/2.17.1.tar.gz"
4+
sha256: "e6ab5f5c60a916dd6c0dd9a19a883a4a1ab3d6b4e95cab925a186fecff08344e"
55
"2.17.0":
6-
url: "https://github.com/datastax/cpp-driver/archive/2.17.0.tar.gz"
7-
sha256: "075af6a6920b0a8b12e37b8e5aa335b0c7919334aa1b451642668e6e37c5372f"
6+
url: "https://github.com/apache/cassandra-cpp-driver/archive/2.17.0.tar.gz"
7+
sha256: "dacd6a19e7d287807cfff5e337ecb29c5e4222f7faf040aa337c33fe59742a30"
88
"2.16.2":
9-
url: "https://github.com/datastax/cpp-driver/archive/2.16.2.tar.gz"
10-
sha256: "de60751bd575b5364c2c5a17a24a40f3058264ea2ee6fef19de126ae550febc9"
9+
url: "https://github.com/apache/cassandra-cpp-driver/archive/2.16.2.tar.gz"
10+
sha256: "38ee1678bbf05eb566be7e45bebd9aedcac98c8a1fccba31bf89057c9cd6c6e3"
1111
"2.15.3":
12-
url: "https://github.com/datastax/cpp-driver/archive/2.15.3.tar.gz"
13-
sha256: "eccb53c5151621c3b647fc83781a542cfb93e76687b4178ebce418fc4c817293"
12+
url: "https://github.com/apache/cassandra-cpp-driver/archive/2.15.3.tar.gz"
13+
sha256: "37aac1aef46833ae535a411782d3eeba4314c0e8d6eecc3b56aeb9179b8c0786"
1414
patches:
1515
"2.17.1":
1616
- patch_file: "patches/2.16.2/fix-cmake.patch"
@@ -22,7 +22,7 @@ patches:
2222
- patch_file: "patches/2.15.3/fix-atomic.patch"
2323
patch_description: "Adapt MemoryOrder definition for C++ 20"
2424
patch_type: "portability"
25-
patch_source: "https://github.com/datastax/cpp-driver/pull/533"
25+
patch_source: "https://github.com/apache/cassandra-cpp-driver/pull/533"
2626
- patch_file: "patches/2.15.3/remove-attribute-for-msvc.patch"
2727
patch_description: "remove attribute for msvc"
2828
patch_type: "portability"
@@ -36,7 +36,7 @@ patches:
3636
- patch_file: "patches/2.15.3/fix-atomic.patch"
3737
patch_description: "Adapt MemoryOrder definition for C++ 20"
3838
patch_type: "portability"
39-
patch_source: "https://github.com/datastax/cpp-driver/pull/533"
39+
patch_source: "https://github.com/apache/cassandra-cpp-driver/pull/533"
4040
- patch_file: "patches/2.15.3/remove-attribute-for-msvc.patch"
4141
patch_description: "remove attribute for msvc"
4242
patch_type: "portability"
@@ -50,7 +50,7 @@ patches:
5050
- patch_file: "patches/2.15.3/fix-atomic.patch"
5151
patch_description: "Adapt MemoryOrder definition for C++ 20"
5252
patch_type: "portability"
53-
patch_source: "https://github.com/datastax/cpp-driver/pull/533"
53+
patch_source: "https://github.com/apache/cassandra-cpp-driver/pull/533"
5454
- patch_file: "patches/2.15.3/remove-attribute-for-msvc.patch"
5555
patch_description: "remove attribute for msvc"
5656
patch_type: "portability"
@@ -64,7 +64,7 @@ patches:
6464
- patch_file: "patches/2.15.3/fix-atomic.patch"
6565
patch_description: "Adapt MemoryOrder definition for C++ 20"
6666
patch_type: "portability"
67-
patch_source: "https://github.com/datastax/cpp-driver/pull/533"
67+
patch_source: "https://github.com/apache/cassandra-cpp-driver/pull/533"
6868
- patch_file: "patches/2.15.3/remove-attribute-for-msvc.patch"
6969
patch_description: "remove attribute for msvc"
7070
patch_type: "portability"

recipes/cgal/all/conandata.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ sources:
3838
"6.0.2":
3939
sha256: 11eaf69d6d21083c6074c2187267cee28541fc462d6b7cbb3deb599007b64f3a
4040
url: https://github.com/CGAL/cgal/releases/download/v6.0.2/CGAL-6.0.2-library.tar.xz
41+
"6.1":
42+
sha256: ef4861f1a55417d1e884306c9408ff64fdf39362a38443f17885c55f7f19278a
43+
url: https://github.com/CGAL/cgal/releases/download/v6.1/CGAL-6.1-library.tar.xz
4144
patches:
4245
"5.3.2":
4346
- patch_file: "patches/0001-fix-for-conan.patch"

recipes/cgal/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ versions:
2525
folder: all
2626
"6.0.2":
2727
folder: all
28+
"6.1":
29+
folder: all

recipes/cmake/binary/conandata.yml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
sources:
2-
"4.1.2":
2+
"4.2.0":
33
Linux:
44
armv8:
5-
url: "https://cmake.org/files/v4.1/cmake-4.1.2-linux-aarch64.tar.gz"
6-
sha256: "0634996f918b3bab11f45522899c81c987b09c9a64d15f6a0d2bb51c42099534"
5+
url: "https://cmake.org/files/v4.2/cmake-4.2.0-linux-aarch64.tar.gz"
6+
sha256: "86f52e9769cd7745e5227931e689e122dc1afc5648cc9b04db601b165f3ac993"
77
x86_64:
8-
url: "https://cmake.org/files/v4.1/cmake-4.1.2-linux-x86_64.tar.gz"
9-
sha256: "773cc679c3a7395413bd096523f8e5d6c39f8718af4e12eb4e4195f72f35e4ab"
8+
url: "https://cmake.org/files/v4.2/cmake-4.2.0-linux-x86_64.tar.gz"
9+
sha256: "bbcebd4c433eab3af03a8c80bb5d84e8dfc3ff8a4ab9d01547b21240c23f7c2c"
1010
Macos:
1111
universal:
12-
url: "https://cmake.org/files/v4.1/cmake-4.1.2-macos-universal.tar.gz"
13-
sha256: "3be85f5b999e327b1ac7d804cbc9acd767059e9f603c42ec2765f6ab68fbd367"
12+
url: "https://cmake.org/files/v4.2/cmake-4.2.0-macos-universal.tar.gz"
13+
sha256: "b8b040a06343b2b6bc090b03a9c2bb4e98037518846989fb7c40ebbf30655c5d"
1414
Windows:
1515
armv8:
16-
url: "https://cmake.org/files/v4.1/cmake-4.1.2-windows-arm64.zip"
17-
sha256: "396bb14c77d12615dfbd666ef6ecd67d3442eb449c321aad25d738216fd9962d"
16+
url: "https://cmake.org/files/v4.2/cmake-4.2.0-windows-arm64.zip"
17+
sha256: "9eb3e88083dda569a4086c48517f5d49bd7b505dada79075ea7cb6e2ac6e0a1e"
1818
x86_64:
19-
url: "https://cmake.org/files/v4.1/cmake-4.1.2-windows-x86_64.zip"
20-
sha256: "82730741149681597510a4bc7095da1460b472dac24eaf9c23ad7440f47753ab"
21-
"3.31.9":
19+
url: "https://cmake.org/files/v4.2/cmake-4.2.0-windows-x86_64.zip"
20+
sha256: "cf35a516c4f5f4646b301e51c8e24b168cc012c3b1453b8f675303b54eb0ef45"
21+
"3.31.10":
2222
Linux:
2323
armv8:
24-
url: "https://cmake.org/files/v3.31/cmake-3.31.9-linux-aarch64.tar.gz"
25-
sha256: "09b7127b09e3d3ed5fa894f4e59f6a01112f267da6acc4249e46dba97b14afcb"
24+
url: "https://cmake.org/files/v3.31/cmake-3.31.10-linux-aarch64.tar.gz"
25+
sha256: "a343c6294f770742904e6a6792e0956b5ff8212abfb63cac99237de2e210fa0f"
2626
x86_64:
27-
url: "https://cmake.org/files/v3.31/cmake-3.31.9-linux-x86_64.tar.gz"
28-
sha256: "312d78e0b7c5c9b4a97a87a46c3e525aa84895fe8135c238c4616bba73dc9518"
27+
url: "https://cmake.org/files/v3.31/cmake-3.31.10-linux-x86_64.tar.gz"
28+
sha256: "3cb3dd247b6a1de2d0f4b20c6fd4326c9024e894cebc9dc8699758887e566ca7"
2929
Macos:
3030
universal:
31-
url: "https://cmake.org/files/v3.31/cmake-3.31.9-macos10.10-universal.tar.gz"
32-
sha256: "709726f0c10c5b5255e9eeee2ac586cdaf7595b0070c7f35def15b1a38fa0c95"
31+
url: "https://cmake.org/files/v3.31/cmake-3.31.10-macos10.10-universal.tar.gz"
32+
sha256: "45054456ff4eb3ea844568590426c0c738d343ed081fbf86b0544cbcde3a4dec"
3333
Windows:
3434
armv8:
35-
url: "https://cmake.org/files/v3.31/cmake-3.31.9-windows-arm64.zip"
36-
sha256: "45b319a85083cedb4e9e0ecc38c2747cdfde19954e645fd2137370e03c4b333a"
35+
url: "https://cmake.org/files/v3.31/cmake-3.31.10-windows-arm64.zip"
36+
sha256: "5bf429626c0fbcfc38a4f7247736e0fedd625197681b07d6b9f5a702f557eb3e"
3737
x86_64:
38-
url: "https://cmake.org/files/v3.31/cmake-3.31.9-windows-x86_64.zip"
39-
sha256: "dc16867d0c0ffb35026976aff119335d5b47def44e76ae82ffafdc1f98b3d59d"
38+
url: "https://cmake.org/files/v3.31/cmake-3.31.10-windows-x86_64.zip"
39+
sha256: "13d1a463d7130df5339baedd63d8ae990aaf385062b2f42f372796143ae94086"

0 commit comments

Comments
 (0)