Merge branch 'conan-io:master' into master

Author: bthomee

recipes/activemq-cpp/all/conanfile.py

@@ -4,7 +4,7 @@
 from conan.tools.apple import fix_apple_shared_install_name
 from conan.tools.build import check_max_cppstd, check_min_cppstd, cross_building
 from conan.tools.env import VirtualRunEnv
-from conan.tools.files import copy, get, rm, rmdir
+from conan.tools.files import copy, get, rm, rmdir, replace_in_file
 from conan.tools.gnu import Autotools, AutotoolsDeps, AutotoolsToolchain, PkgConfigDeps
 from conan.tools.layout import basic_layout
 
@@ -34,10 +34,10 @@ def layout(self):
         basic_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("apr/[>=1.3]")
+        self.requires("apr/[>=1.3]", transitive_headers=True)
         self.requires("apr-util/[>=1.3]")
         self.requires("libuuid/[>=1.0.3]")
-        self.requires("openssl/[>=1.1 <4]")
+        self.requires("openssl/[>=1.1 <4]", transitive_headers=True)
 
     def validate(self):
         check_min_cppstd(self, 11)
@@ -48,6 +48,9 @@ def build_requirements(self):
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
+        replace_in_file(self, os.path.join(self.source_folder, "activemq-cpp", "Makefile.am"),
+                        "SUBDIRS = src/main src/examples",
+                        "SUBDIRS = src/main")
 
     def generate(self):
         if not cross_building(self):
@@ -94,6 +97,7 @@ def package_info(self):
         self.cpp_info.libs = ["activemq-cpp"]
 
         self.cpp_info.set_property("pkg_config_name", "activemq-cpp")
+        self.cpp_info.defines = ["HAVE_OPENSSL"]
 
         if self.settings.os in ["Linux", "FreeBSD", "Macos"]:
             self.cpp_info.system_libs.extend(["dl", "m", "pthread"])

recipes/alpaka/all/conandata.yml

@@ -0,0 +1,5 @@
+sources:
+  "2.1.1":
+    url: "https://github.com/alpaka-group/alpaka/archive/refs/tags/2.1.1.tar.gz"
+    sha256: "2d30a43594c55067297947b0ec83300e4f2899497464c5cc6f142c823f3ea1b2"
+

recipes/alpaka/all/conanfile.py

@@ -0,0 +1,58 @@
+from conan import ConanFile
+from conan.tools.build import check_min_cppstd
+from conan.tools.cmake import CMake, cmake_layout
+from conan.tools.files import copy, get, rmdir
+import os
+
+required_conan_version = ">=2.0"
+
+
+class AlpakaConan(ConanFile):
+    name = "alpaka"
+    description = "The alpaka library is a header-only C++20 abstraction library for accelerator development"
+    license = "MPL-2.0"
+    url = "https://github.com/conan-io/conan-center-index"
+    homepage = "https://github.com/alpaka-group/alpaka"
+    topics = ("hpc", "cuda", "hip", "sycl", "gpu", "heterogeneous-computing")
+
+    package_type = "header-library"
+    settings = "os", "arch", "compiler", "build_type"
+    generators = "CMakeDeps", "CMakeToolchain"
+
+    def layout(self):
+        cmake_layout(self, src_folder="src")
+
+    def requirements(self):
+        self.requires("boost/[>=1.74.0 <2]")
+
+    def build_requirements(self):
+        self.tool_requires("cmake/[>=3.25]")
+
+    def package_id(self):
+        self.info.clear()
+
+    def validate(self):
+        check_min_cppstd(self, 20)
+
+    def source(self):
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def package(self):
+        copy(self, "LICENSE", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
+        cmake = CMake(self)
+        cmake.install()
+        rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
+
+    def package_info(self):
+        self.cpp_info.bindirs = []
+        self.cpp_info.libdirs = []
+
+        self.cpp_info.requires = ["boost::headers"]
+
+        if self.settings.os in ["Linux", "FreeBSD"]:
+            self.cpp_info.system_libs.extend(["pthread", "rt"])

recipes/alpaka/all/test_package/CMakeLists.txt

@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 3.15)
+project(test_package LANGUAGES CXX)
+
+find_package(alpaka REQUIRED CONFIG)
+
+add_executable(${PROJECT_NAME} test_package.cpp)
+target_link_libraries(${PROJECT_NAME} PRIVATE alpaka::alpaka)

…esiprocate/all/test_package/conanfile.py …pes/alpaka/all/test_package/conanfile.pyrecipes/resiprocate/all/test_package/conanfile.py renamed to recipes/alpaka/all/test_package/conanfile.py recipes/resiprocate/all/test_package/conanfile.py renamed to recipes/alpaka/all/test_package/conanfile.py

@@ -6,15 +6,14 @@
 
 class TestPackageConan(ConanFile):
     settings = "os", "arch", "compiler", "build_type"
-    generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv"
-    test_type = "explicit"
-
-    def requirements(self):
-        self.requires(self.tested_reference_str)
+    generators = "CMakeDeps", "CMakeToolchain"
 
     def layout(self):
         cmake_layout(self)
 
+    def requirements(self):
+        self.requires(self.tested_reference_str)
+
     def build(self):
         cmake = CMake(self)
         cmake.configure()

recipes/alpaka/all/test_package/test_package.cpp

@@ -0,0 +1,17 @@
+#include <alpaka/alpaka.hpp>
+
+#include <iostream>
+
+int main() {
+    std::cout << "alpaka version: "
+              << ALPAKA_VERSION_MAJOR << "."
+              << ALPAKA_VERSION_MINOR << "."
+              << ALPAKA_VERSION_PATCH << std::endl;
+
+    // List enabled accelerator tags
+    std::cout << "Enabled accelerator tags:" << std::endl;
+    alpaka::printTagNames<alpaka::EnabledAccTags>();
+
+    return 0;
+}
+

recipes/alpaka/config.yml

@@ -0,0 +1,4 @@
+versions:
+  "2.1.1":
+    folder: all
+

recipes/apr-util/all/conanfile.py

@@ -7,7 +7,6 @@
 from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rm, rmdir
 from conan.tools.gnu import Autotools, AutotoolsDeps, AutotoolsToolchain
 from conan.tools.layout import basic_layout
-from conan.tools.microsoft import is_msvc
 import os
 
 required_conan_version = ">=1.54.0"
@@ -92,7 +91,7 @@ def requirements(self):
         if self.options.with_expat:
             self.requires("expat/[>=2.6.2 <3]")
         if self.options.with_postgresql:
-            self.requires("libpq/15.4")
+            self.requires("libpq/[>=15.4 <18]")
 
     def validate(self):
         if not self.options.with_expat:
@@ -213,9 +212,3 @@ def package_info(self):
         libdirs = [p for dep in deps for p in dep.cpp_info.aggregated_components().libdirs]
         aprutil_ldflags = " ".join([f"-L{p}" for p in libdirs])
         self.runenv_info.define("APRUTIL_LDFLAGS", aprutil_ldflags)
-
-        # TODO: to remove in conan v2
-        self.env_info.PATH.append(os.path.join(self.package_folder, "bin"))
-        self.env_info.APR_UTIL_ROOT = self.package_folder
-        if not is_msvc(self):
-            self.env_info.APRUTIL_LDFLAGS = aprutil_ldflags