diff --git a/recipes/au/all/conandata.yml b/recipes/au/all/conandata.yml index bce186970361a..b6d7d9cd5b06b 100644 --- a/recipes/au/all/conandata.yml +++ b/recipes/au/all/conandata.yml @@ -2,8 +2,18 @@ sources: "0.3.5": url: "https://github.com/aurora-opensource/au/archive/refs/tags/0.3.5.tar.gz" sha256: "7ec826dc42968dc1633de56e4f9d06e70de73e820d2ac4788e8453343a622c9b" + "0.4.0": + url: "https://github.com/aurora-opensource/au/archive/refs/tags/0.4.0.tar.gz" + sha256: "a8ff2a145d30ce6345a59b4b8145d32516b1b6fe1f1e1b1b8af44df23d5a7f6c" + "0.4.1": + url: "https://github.com/aurora-opensource/au/archive/refs/tags/0.4.1.tar.gz" + sha256: "5e88a0ffcb0a0843f4bd4d4ea4429c793f85dfcb8c1e7f7978de6fecab739b84" patches: "0.3.5": - patch_file: "patches/0001-v0.3.5-disable-gtest.patch" patch_description: "Remove GTest dependency and disable tests build" patch_type: "conan" + "0.4.0": + - patch_file: "patches/0001-v0.4.0-add-static-cast-checkers-to-cmake.patch" + patch_description: "Fix broken CMake build by adding static_cast_checkers" + patch_type: "conan" diff --git a/recipes/au/all/conanfile.py b/recipes/au/all/conanfile.py index a6d9acc2f5311..3f47d66f33a9d 100644 --- a/recipes/au/all/conanfile.py +++ b/recipes/au/all/conanfile.py @@ -59,6 +59,8 @@ def source(self): def generate(self): tc = CMakeToolchain(self) + tc.variables["AU_EXCLUDE_GTEST_DEPENDENCY"] = "ON" + tc.variables["AU_ENABLE_TESTING"] = "OFF" tc.generate() def build(self): diff --git a/recipes/au/all/patches/0001-v0.4.0-add-static-cast-checkers-to-cmake.patch b/recipes/au/all/patches/0001-v0.4.0-add-static-cast-checkers-to-cmake.patch new file mode 100644 index 0000000000000..cb7ec39615327 --- /dev/null +++ b/recipes/au/all/patches/0001-v0.4.0-add-static-cast-checkers-to-cmake.patch @@ -0,0 +1,42 @@ +From cbc9e0dcabad4216dcc39a6e5204c91bc08bda94 Mon Sep 17 00:00:00 2001 +From: Chip Hogg +Date: Sun, 15 Dec 2024 14:05:18 -0500 +Subject: [PATCH] Add `static_cast_checkers` to CMake + +This was apparently overlooked in #347. + +Helps #359. +--- + au/code/au/CMakeLists.txt | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/au/code/au/CMakeLists.txt b/au/code/au/CMakeLists.txt +index edb965c..7c518bf 100644 +--- a/au/code/au/CMakeLists.txt ++++ b/au/code/au/CMakeLists.txt +@@ -39,6 +39,7 @@ header_only_library( + quantity.hh + quantity_point.hh + rep.hh ++ static_cast_checkers.hh + unit_of_measure.hh + unit_symbol.hh + wrapper_operations.hh +@@ -465,6 +466,14 @@ gtest_based_test( + au + ) + ++gtest_based_test( ++ NAME static_cast_checkers_test ++ SRCS ++ static_cast_checkers_test.cc ++ DEPS ++ au ++) ++ + gtest_based_test( + NAME stdx_test + SRCS +-- +2.34.1 + diff --git a/recipes/au/all/test_package/test_package.cpp b/recipes/au/all/test_package/test_package.cpp index 35bad3194d8e4..ff27bb3a89725 100644 --- a/recipes/au/all/test_package/test_package.cpp +++ b/recipes/au/all/test_package/test_package.cpp @@ -9,7 +9,7 @@ using namespace au; int main(void) { constexpr auto length = meters(100.0); - std::cout << length << " == " << length.in(kilo(meters)) <<" km" << std::endl; + std::cout << length << " == " << length.as(kilo(meters)) << std::endl; return EXIT_SUCCESS; } diff --git a/recipes/au/config.yml b/recipes/au/config.yml index ef7972c36ec69..67dd930486b28 100644 --- a/recipes/au/config.yml +++ b/recipes/au/config.yml @@ -1,3 +1,7 @@ versions: "0.3.5": folder: all + "0.4.0": + folder: all + "0.4.1": + folder: all