diff --git a/Formula/a/adios2.rb b/Formula/a/adios2.rb index 5ea9912a1914b..9af078627010b 100644 --- a/Formula/a/adios2.rb +++ b/Formula/a/adios2.rb @@ -1,25 +1,32 @@ class Adios2 < Formula desc "Next generation of ADIOS developed in the Exascale Computing Program" homepage "https://adios2.readthedocs.io" - url "https://github.com/ornladios/ADIOS2/archive/refs/tags/v2.9.2.tar.gz" - sha256 "78309297c82a95ee38ed3224c98b93d330128c753a43893f63bbe969320e4979" license "Apache-2.0" - revision 2 head "https://github.com/ornladios/ADIOS2.git", branch: "master" + stable do + url "https://github.com/ornladios/ADIOS2/archive/refs/tags/v2.10.0.tar.gz" + sha256 "e5984de488bda546553dd2f46f047e539333891e63b9fe73944782ba6c2d95e4" + + # fix pugixml target name + # upstream patch ref, https://github.com/ornladios/ADIOS2/pull/4135 + # https://github.com/ornladios/ADIOS2/pull/4142 + patch :DATA + end + livecheck do url :stable regex(/^v?(\d+(?:\.\d+)+)$/i) end bottle do - sha256 arm64_sonoma: "adae563be0e6a56fec81f3d396ad4611b818c70a7acc54be504b1a3b0896e652" - sha256 arm64_ventura: "283d482432e189fe6cb1a302089e2615e49a12bfac57db69f087efe80290eae9" - sha256 arm64_monterey: "e28f7eb517b74faaefb469e0b7bca433a7f68f04e0bde43743a866f8d3e3effc" - sha256 sonoma: "7933ca4cad6d0c75fa5bf2b7caf4f0675980880c4d259bf31e7294be03d75433" - sha256 ventura: "4a90152c29da3dcb1b329191b3bdb783eb11730b3014864080d93005fdc17534" - sha256 monterey: "e883fb195102fcb4e142baee668cb5532bfb0aec8413e67d35d28575915dd2a4" - sha256 x86_64_linux: "50dab40f7ef2a78b751fc532b74ee32d0c28a0636e1fa5c81fe59450c4806e55" + sha256 arm64_sonoma: "f27bc3122be07a98fd8db78211d426cc0288623dff91e7427840266936855a1e" + sha256 arm64_ventura: "de760c48271b31dc9310360fdc9b381d916625a5a8ae49d114dcc22e6dc444a5" + sha256 arm64_monterey: "988b4a7ca6198fcebd0a430b84918e6ed58bbceb71983b9e0c14024637f41a80" + sha256 sonoma: "dfa5e5f519e3266512b5963937070607e3362281e0219d028f8b43f3d29b0528" + sha256 ventura: "ecc5229d30b5d6c61d21834dc280e48ff85c9f3c954cbea3009025f945dd6640" + sha256 monterey: "59caa71985070eb7d28f0fd096782299e88ab64eed87f0200f00cf30c8e045c2" + sha256 x86_64_linux: "97f031412ebf7c38631b2b30087675beed1fd1f28c2a87f4ad25654175ba879c" end depends_on "cmake" => :build @@ -92,18 +99,67 @@ def install system "cmake", "--build", "build" system "cmake", "--install", "build" - (pkgshare/"test").install "examples/hello/bpWriter/helloBPWriter.cpp" - (pkgshare/"test").install "examples/hello/bpWriter/helloBPWriter.py" + (pkgshare/"test").install "examples/hello/bpWriter/bpWriter.cpp" + (pkgshare/"test").install "examples/hello/bpWriter/bpWriter.py" end test do adios2_config_flags = Utils.safe_popen_read(bin/"adios2-config", "--cxx").chomp.split - system "mpic++", pkgshare/"test/helloBPWriter.cpp", *adios2_config_flags + system "mpic++", pkgshare/"test/bpWriter.cpp", *adios2_config_flags system "./a.out" assert_predicate testpath/"myVector_cpp.bp", :exist? system python3, "-c", "import adios2" - system python3, pkgshare/"test/helloBPWriter.py" - assert_predicate testpath/"npArray.bp", :exist? + system python3, pkgshare/"test/bpWriter.py" + assert_predicate testpath/"bpWriter-py.bp", :exist? end end + +__END__ +diff --git a/source/adios2/toolkit/remote/CMakeLists.txt b/source/adios2/toolkit/remote/CMakeLists.txt +index a739e1a..fdea6ec 100644 +--- a/source/adios2/toolkit/remote/CMakeLists.txt ++++ b/source/adios2/toolkit/remote/CMakeLists.txt +@@ -6,15 +6,11 @@ + if (NOT ADIOS2_USE_PIP) + add_executable(adios2_remote_server ./remote_server.cpp remote_common.cpp) + +- target_link_libraries(adios2_remote_server PUBLIC EVPath::EVPath adios2_core adios2sys +- PRIVATE $<$:shlwapi>) ++ target_link_libraries(adios2_remote_server ++ PUBLIC EVPath::EVPath adios2_core adios2sys ++ PRIVATE adios2::thirdparty::pugixml $<$:shlwapi>) + +- get_property(pugixml_headers_path +- TARGET pugixml +- PROPERTY INTERFACE_INCLUDE_DIRECTORIES +- ) +- +- target_include_directories(adios2_remote_server PRIVATE ${PROJECT_BINARY_DIR} ${pugixml_headers_path}) ++ target_include_directories(adios2_remote_server PRIVATE ${PROJECT_BINARY_DIR}) + + set_property(TARGET adios2_remote_server PROPERTY OUTPUT_NAME adios2_remote_server${ADIOS2_EXECUTABLE_SUFFIX}) + install(TARGETS adios2_remote_server EXPORT adios2 +diff --git a/source/utils/CMakeLists.txt b/source/utils/CMakeLists.txt +index 30dd484..01f5f93 100644 +--- a/source/utils/CMakeLists.txt ++++ b/source/utils/CMakeLists.txt +@@ -13,17 +13,11 @@ configure_file( + add_executable(bpls ./bpls/bpls.cpp) + target_link_libraries(bpls + PUBLIC adios2_core adios2sys +- PRIVATE $<$:shlwapi>) +- +-get_property(pugixml_headers_path +- TARGET pugixml +- PROPERTY INTERFACE_INCLUDE_DIRECTORIES +-) ++ PRIVATE adios2::thirdparty::pugixml $<$:shlwapi>) + + target_include_directories(bpls PRIVATE + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/bindings/C +- ${pugixml_headers_path} + ) + + set_property(TARGET bpls PROPERTY OUTPUT_NAME bpls${ADIOS2_EXECUTABLE_SUFFIX})