Skip to content

Commit 612fb15

Browse files
authored
Merge branch 'conan-io:master' into master
2 parents 263dd4e + 04caa02 commit 612fb15

File tree

132 files changed

+952
-2091
lines changed

Some content is hidden

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

132 files changed

+952
-2091
lines changed

recipes/bgfx/cmake/conanfile.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,14 @@ def package(self):
9393
def package_info(self):
9494
self.cpp_info.set_property("cmake_file_name", "bgfx")
9595
bgfx_tools_utils = os.path.join(self.package_folder, "lib", "cmake", "bgfx", "bgfxToolUtils.cmake")
96+
self.cpp_info.set_property(
97+
"cmake_extra_variables",
98+
{
99+
# This is used by bgfx shader compiler and tools to be able to, for example,
100+
# find bgfx_shader.sh as part of bgfxToolUtils.cmake utils
101+
"BGFX_SHADER_INCLUDE_PATH": os.path.join(self.package_folder, "include", "bgfx").replace("\\", "/")
102+
},
103+
)
96104
self.cpp_info.set_property("cmake_build_modules", [bgfx_tools_utils])
97105

98106
self.cpp_info.components["bx"].set_property("cmake_target_name", "bgfx::bx")
@@ -140,6 +148,7 @@ def package_info(self):
140148
for tool in ["bin2c", "texturec", "texturev", "geometryc", "geometryv", "shaderc"]:
141149
self.cpp_info.components[tool].set_property("cmake_target_name", f"bgfx::{tool}")
142150
# INFO: .exe requires CMakeConfigDeps generator
143-
self.cpp_info.components[tool].exe = os.path.join(self.package_folder, "bin", tool)
151+
self.cpp_info.components[tool].exe = tool
152+
self.cpp_info.components[tool].location = os.path.join(self.package_folder, "bin", tool)
144153
self.cpp_info.components[tool].libdirs = []
145154
self.cpp_info.components[tool].includedirs = []

recipes/casbin/all/conandata.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
sources:
2+
"1.66.3":
3+
url: "https://github.com/casbin/casbin-cpp/archive/refs/tags/v1.66.3.tar.gz"
4+
sha256: "59527b076e8632cf01abcdc97c212385e216b4dd20e439a807539a0e3d1efe2b"

recipes/casbin/all/conanfile.py

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
from conan import ConanFile
2+
from conan.tools.build import check_min_cppstd
3+
from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
4+
from conan.tools.files import copy, get, replace_in_file
5+
import os
6+
7+
required_conan_version = ">=2.4.0"
8+
9+
class CasbinConan(ConanFile):
10+
name = "casbin"
11+
description = "An authorization library that supports access control models like ACL, RBAC, ABAC in C/C++"
12+
license = "Apache-2.0"
13+
url = "https://github.com/conan-io/conan-center-index"
14+
homepage = "https://github.com/casbin/casbin-cpp"
15+
topics = ("authorization", "access-control", "acl", "rbac", "abac", "permission")
16+
package_type = "static-library"
17+
settings = "os", "arch", "compiler", "build_type"
18+
options = {
19+
"fPIC": [True, False],
20+
}
21+
default_options = {
22+
"fPIC": True
23+
}
24+
languages = "C++"
25+
implements = ["auto_shared_fpic"]
26+
27+
def layout(self):
28+
cmake_layout(self, src_folder="src")
29+
30+
def requirements(self):
31+
self.requires("nlohmann_json/[>=3.11 <3.13]", transitive_headers=True)
32+
33+
def validate(self):
34+
check_min_cppstd(self, 17)
35+
36+
def source(self):
37+
get(self, **self.conan_data["sources"][self.version], strip_root=True)
38+
replace_in_file(self, os.path.join(self.source_folder, "CMakeLists.txt"), "set(CMAKE_CXX_STANDARD", "# set(CMAKE_CXX_STANDARD")
39+
replace_in_file(self, os.path.join(self.source_folder, "casbin", "CMakeLists.txt"), "set(CMAKE_CXX_STANDARD", "# set(CMAKE_CXX_STANDARD")
40+
41+
def generate(self):
42+
tc = CMakeToolchain(self)
43+
tc.cache_variables["CASBIN_BUILD_TEST"] = False
44+
tc.cache_variables["CASBIN_BUILD_BENCHMARK"] = False
45+
tc.cache_variables["CASBIN_BUILD_PYTHON_BINDINGS"] = False
46+
tc.cache_variables["CASBIN_INSTALL"] = True
47+
tc.generate()
48+
49+
deps = CMakeDeps(self)
50+
deps.set_property("nlohmann_json", "cmake_file_name", "json")
51+
deps.generate()
52+
53+
def build(self):
54+
cmake = CMake(self)
55+
cmake.configure()
56+
cmake.build()
57+
58+
def package(self):
59+
cmake = CMake(self)
60+
cmake.install()
61+
62+
copy(self, "LICENSE", self.source_folder, os.path.join(self.package_folder, "licenses"))
63+
64+
# Upstream does not install these so we manually copy them
65+
lib_folder = os.path.join(self.package_folder, "lib")
66+
copy(self, "*.a", self.build_folder, lib_folder, keep_path=False)
67+
copy(self, "*.lib", self.build_folder, lib_folder, keep_path=False)
68+
69+
def package_info(self):
70+
if self.settings.os == "Windows":
71+
self.cpp_info.libs = ["casbin"]
72+
else:
73+
self.cpp_info.libs = ["casbin.a"]
74+
self.cpp_info.set_property("cmake_file_name", "casbin")
75+
self.cpp_info.set_property("cmake_target_name", "casbin::casbin")
76+
77+
if self.settings.os in ["Linux", "FreeBSD"]:
78+
self.cpp_info.system_libs.append("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(casbin REQUIRED CONFIG)
5+
6+
add_executable(${PROJECT_NAME} test_package.cpp)
7+
target_link_libraries(${PROJECT_NAME} PRIVATE casbin::casbin)
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: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#include <cstdlib>
2+
#include <iostream>
3+
4+
#include <casbin/casbin.h>
5+
6+
int main() {
7+
std::cout << casbin::Join({"Test", "OK"}, " ") << std::endl;
8+
return EXIT_SUCCESS;
9+
}

recipes/casbin/config.yml

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

recipes/cgal/all/conandata.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,15 @@ 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.0.3":
42+
sha256: 5c82166e6934397a523f2cb0aa35921d17e97f56fbc24e649a8627ef60a76a5c
43+
url: https://github.com/CGAL/cgal/releases/download/v6.0.3/CGAL-6.0.3-library.tar.xz
4144
"6.1":
4245
sha256: ef4861f1a55417d1e884306c9408ff64fdf39362a38443f17885c55f7f19278a
4346
url: https://github.com/CGAL/cgal/releases/download/v6.1/CGAL-6.1-library.tar.xz
47+
"6.1.1":
48+
sha256: 37e9fffe48a83209b070e1914c6aa0a7bae8076749712ab78b53245e176e0e0e
49+
url: https://github.com/CGAL/cgal/releases/download/v6.1.1/CGAL-6.1.1-library.tar.xz
4450
patches:
4551
"5.3.2":
4652
- patch_file: "patches/0001-fix-for-conan.patch"

recipes/cgal/config.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,9 @@ versions:
2525
folder: all
2626
"6.0.2":
2727
folder: all
28+
"6.0.3":
29+
folder: all
2830
"6.1":
2931
folder: all
32+
"6.1.1":
33+
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.2.2":
2+
"4.2.3":
33
Linux:
44
armv8:
5-
url: "https://cmake.org/files/v4.2/cmake-4.2.2-linux-aarch64.tar.gz"
6-
sha256: "2faba984deb013d14c3e30fd428292fd45e631feb1359fe65b710aadc29ec7ce"
5+
url: "https://cmake.org/files/v4.2/cmake-4.2.3-linux-aarch64.tar.gz"
6+
sha256: "e529c75f18f27ba27c52b329efe7b1f98dc32ccc0c6d193c7ab343f888962672"
77
x86_64:
8-
url: "https://cmake.org/files/v4.2/cmake-4.2.2-linux-x86_64.tar.gz"
9-
sha256: "893a5c7ca805234accafb0f1c940660822df1964413d612b5971816dd6e54eab"
8+
url: "https://cmake.org/files/v4.2/cmake-4.2.3-linux-x86_64.tar.gz"
9+
sha256: "5bb505d5e0cca0480a330f7f27ccf52c2b8b5214c5bba97df08899f5ef650c23"
1010
Macos:
1111
universal:
12-
url: "https://cmake.org/files/v4.2/cmake-4.2.2-macos-universal.tar.gz"
13-
sha256: "e9fd48469364cf361fce92dfb78a6ba951728df50331668e7ebfe40dceb77fd2"
12+
url: "https://cmake.org/files/v4.2/cmake-4.2.3-macos-universal.tar.gz"
13+
sha256: "c2302d3e9c48daabee5ea7c4db4b2b93b989bcc89dae8b760880e00120641b5b"
1414
Windows:
1515
armv8:
16-
url: "https://cmake.org/files/v4.2/cmake-4.2.2-windows-arm64.zip"
17-
sha256: "47230d0f4495e2d36c4c2627b952877b2f7cfe404269f0dddba6b85fc89451bd"
16+
url: "https://cmake.org/files/v4.2/cmake-4.2.3-windows-arm64.zip"
17+
sha256: "751b206b1cf65151b72c525d26267c1d9beebf8fafc365ae00286571d9fd3ed9"
1818
x86_64:
19-
url: "https://cmake.org/files/v4.2/cmake-4.2.2-windows-x86_64.zip"
20-
sha256: "b71b3515bbba0b9b0e05852a3bcb82af548579fdcd6ba7a23f8608518c44bdde"
21-
"3.31.10":
19+
url: "https://cmake.org/files/v4.2/cmake-4.2.3-windows-x86_64.zip"
20+
sha256: "eb4ebf5155dbb05436d675706b2a08189430df58904257ae5e91bcba4c86933c"
21+
"3.31.11":
2222
Linux:
2323
armv8:
24-
url: "https://cmake.org/files/v3.31/cmake-3.31.10-linux-aarch64.tar.gz"
25-
sha256: "a343c6294f770742904e6a6792e0956b5ff8212abfb63cac99237de2e210fa0f"
24+
url: "https://cmake.org/files/v3.31/cmake-3.31.11-linux-aarch64.tar.gz"
25+
sha256: "faef5420c3853d0e10a3862a0d3c71b40ffc2de36fc0ef0bcc5c896cf18f240f"
2626
x86_64:
27-
url: "https://cmake.org/files/v3.31/cmake-3.31.10-linux-x86_64.tar.gz"
28-
sha256: "3cb3dd247b6a1de2d0f4b20c6fd4326c9024e894cebc9dc8699758887e566ca7"
27+
url: "https://cmake.org/files/v3.31/cmake-3.31.11-linux-x86_64.tar.gz"
28+
sha256: "d815c10cf54e8e122088b3bb25ea6b4010fb96b7ad6e1ad3fdef75be3d996b0b"
2929
Macos:
3030
universal:
31-
url: "https://cmake.org/files/v3.31/cmake-3.31.10-macos10.10-universal.tar.gz"
32-
sha256: "45054456ff4eb3ea844568590426c0c738d343ed081fbf86b0544cbcde3a4dec"
31+
url: "https://cmake.org/files/v3.31/cmake-3.31.11-macos10.10-universal.tar.gz"
32+
sha256: "8597e25bdbe1c9e11dcd988deb2b6b4c5d236407deadf8874bbbea1412150fcb"
3333
Windows:
3434
armv8:
35-
url: "https://cmake.org/files/v3.31/cmake-3.31.10-windows-arm64.zip"
36-
sha256: "5bf429626c0fbcfc38a4f7247736e0fedd625197681b07d6b9f5a702f557eb3e"
35+
url: "https://cmake.org/files/v3.31/cmake-3.31.11-windows-arm64.zip"
36+
sha256: "83b0b87f10f53fc5133f8974f3dc8df0c1af91f254bc5f365de6e1bec6b64eb4"
3737
x86_64:
38-
url: "https://cmake.org/files/v3.31/cmake-3.31.10-windows-x86_64.zip"
39-
sha256: "13d1a463d7130df5339baedd63d8ae990aaf385062b2f42f372796143ae94086"
38+
url: "https://cmake.org/files/v3.31/cmake-3.31.11-windows-x86_64.zip"
39+
sha256: "1210542e49be1a88edfcfd7a3c68407804f5e85945509cf1c5eb5470b5e35beb"

0 commit comments

Comments
 (0)