From 4084cf6a991213aea5a141868c8b20894bcfc2a2 Mon Sep 17 00:00:00 2001 From: Eyal Rozenberg Date: Tue, 24 Dec 2024 02:29:58 +0200 Subject: [PATCH] Updated cuda-api-wrappers recipe: * Removed 0.7 beta versions * Added versions 0.7.0, 0.7.1 and 0.8.0 * fixed a mistype in the test package `CMakeLists.txt` --- recipes/cuda-api-wrappers/all/conandata.yml | 15 +++++++++------ recipes/cuda-api-wrappers/all/conanfile.py | 4 ++++ .../all/test_package/CMakeLists.txt | 4 ++-- recipes/cuda-api-wrappers/config.yml | 6 ++++-- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/recipes/cuda-api-wrappers/all/conandata.yml b/recipes/cuda-api-wrappers/all/conandata.yml index a2ea7cff0b936..54d1121cafbd2 100644 --- a/recipes/cuda-api-wrappers/all/conandata.yml +++ b/recipes/cuda-api-wrappers/all/conandata.yml @@ -1,10 +1,13 @@ sources: - "0.7.0-b2": - url: "https://github.com/eyalroz/cuda-api-wrappers/archive/refs/tags/v0.7.0-b2.tar.gz" - sha256: "9439cb2250dd3045a05d43c4ca66b5d49535eeba123b05a2e49169354fdb3123" - "0.7-b1": - url: "https://github.com/eyalroz/cuda-api-wrappers/archive/0.7b1.tar.gz" - sha256: "1ed5912d8f602ccd176865b824de17f462cb57142eb2a685d7cc034831e54a71" + "0.8.0": + url: "https://github.com/eyalroz/cuda-api-wrappers/archive/refs/tags/v0.8.0.tar.gz" + sha256: "16c68e450e553d2839f00503a44e85b32c4f4e08f154e9f7c85f706bc5c79bf3" + "0.7.1": + url: "https://github.com/eyalroz/cuda-api-wrappers/archive/refs/tags/v0.7.1.tar.gz" + sha256: "fa30c9fe43a62f5a3fd82a5deb477838fbf0bf455c73a2d2bb5ab6284184900b" + "0.7.0": + url: "https://github.com/eyalroz/cuda-api-wrappers/archive/refs/tags/v0.7.0.tar.gz" + sha256: "a47d11607ffa0c41cfffe689840a14125520da3f4bb504267e9d232ebb846457" "0.6.8": url: "https://github.com/eyalroz/cuda-api-wrappers/archive/refs/tags/v0.6.8.tar.gz" sha256: "a0d1b062dbe41c99d06df4ae7885a053c2ae3815d6fe12df0458bc5277d08ed7" diff --git a/recipes/cuda-api-wrappers/all/conanfile.py b/recipes/cuda-api-wrappers/all/conanfile.py index bca11c0ee8633..cf6b40185fc13 100644 --- a/recipes/cuda-api-wrappers/all/conanfile.py +++ b/recipes/cuda-api-wrappers/all/conanfile.py @@ -47,3 +47,7 @@ def package_info(self): if self.settings.os in ["Linux", "FreeBSD"]: self.cpp_info.system_libs = ["pthread"] + + def build_requirements(self): + self.tool_requires("cmake/[>=3.25]") + diff --git a/recipes/cuda-api-wrappers/all/test_package/CMakeLists.txt b/recipes/cuda-api-wrappers/all/test_package/CMakeLists.txt index 60f8a4074a3bc..6098dfc0d2d36 100644 --- a/recipes/cuda-api-wrappers/all/test_package/CMakeLists.txt +++ b/recipes/cuda-api-wrappers/all/test_package/CMakeLists.txt @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.25) project(test_package LANGUAGES CXX) find_package(cuda-api-wrappers REQUIRED CONFIG) add_executable(${PROJECT_NAME} test_package.cpp) -target_link_libraries(${PROJECT_NAME} PRIVATE cuda-api-wrappers::cuda-api-wrappers) +target_link_libraries(${PROJECT_NAME} PRIVATE cuda-api-wrappers::runtime-and-driver) target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11) target_compile_definitions(${PROJECT_NAME} PRIVATE CUDA_API_WRAPPERS_VERSION=\"${cuda-api-wrappers_VERSION_STRING}\") diff --git a/recipes/cuda-api-wrappers/config.yml b/recipes/cuda-api-wrappers/config.yml index 60cce1aaafb6b..8f11aca98582d 100644 --- a/recipes/cuda-api-wrappers/config.yml +++ b/recipes/cuda-api-wrappers/config.yml @@ -1,7 +1,9 @@ versions: - "0.7.0-b2": + "0.8.0": folder: all - "0.7-b1": + "0.7.1": + folder: all + "0.7.0": folder: all "0.6.8": folder: all