<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/18d9681cd771e071c826ea7b1c6d1d73efc9bc37">https://github.com/macports/macports-ports/commit/18d9681cd771e071c826ea7b1c6d1d73efc9bc37</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 18d9681cd771e071c826ea7b1c6d1d73efc9bc37
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri May 26 11:04:29 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> xdmf: add tests variant
</span>---
science/xdmf/Portfile | 10 ++++++-
science/xdmf/files/patch-fix_tests.diff | 50 +++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/xdmf/Portfile b/science/xdmf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 14c5847c5b1..e19da69ea99 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/xdmf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/xdmf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,8 +28,10 @@ depends_lib-append port:tiff \
</span>
# avoid self-conflict
# allow VTK and ParaView to find libraries
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix tests
</span> patchfiles-append patch-isystem.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-libraries.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libraries.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix_tests.diff
</span>
configure.args-append -DBUILD_SHARED_LIBS=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +45,12 @@ post-destroot {
</span> reinplace "s|set(XDMF_|set(XDMF${xdmf_major}_|g" ${destroot}${prefix}/lib/cmake/xdmf${xdmf_major}/xdmf${xdmf_major}Config.cmake
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant tests description {Enable tests} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DXDMF_BUILD_TESTING=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.args-append DYLD_LIBRARY_PATH=${cmake.build_dir}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regexm
livecheck.version ${git.branch}
livecheck.url https://gitlab.kitware.com/xdmf/xdmf/-/commits/master
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/xdmf/files/patch-fix_tests.diff b/science/xdmf/files/patch-fix_tests.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ff36f7bb189
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/xdmf/files/patch-fix_tests.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,50 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/C/CMakeLists.txt.orig 2023-05-23 09:37:42
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/C/CMakeLists.txt 2023-05-23 09:48:28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_TEST_C(CTestXdmfDomain)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (TIFF_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_TEST_C(CTestXdmfTIFFReadWriteCompressed)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(CTestXdmfTIFFReadWriteCompressed PRIVATE ${TIFF_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_TEST_C(CTestXdmfTopology)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_TEST_C(CTestXdmfGeometry)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/Cxx/CMakeLists.txt.orig 2023-05-23 09:50:13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/Cxx/CMakeLists.txt 2023-05-23 09:51:44
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,6 +40,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_TEST_CXX(TestXdmfTime)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (TIFF_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_TEST_CXX(TestXdmfTIFFReadWriteCompressed)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(TestXdmfTIFFReadWriteCompressed PRIVATE ${TIFF_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif (TIFF_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_TEST_CXX(TestXdmfTopology)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_TEST_CXX(TestXdmfTopologyMixed)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- core/tests/C/CMakeLists.txt.orig 2023-05-26 06:45:54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ core/tests/C/CMakeLists.txt 2023-05-26 06:46:28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,10 +6,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_TEST_C_DEPENDENCIES("XdmfCore")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add any ldpath directories that the cxx tests may need
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ADD_TEST_C_LDPATH("${CMAKE_BINARY_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ADD_TEST_C_LDPATH("${CMAKE_BINARY_DIR}/lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add any path directoreis that the Cxx tests may need
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ADD_TEST_C_PATH("${CMAKE_BINARY_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ADD_TEST_C_PATH("${CMAKE_BINARY_DIR}/bin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add any cxx tests here:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note: We don't want to use a foreach loop to test the files incase we
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- core/tests/Cxx/CMakeLists.txt.orig 2023-05-26 06:45:54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ core/tests/Cxx/CMakeLists.txt 2023-05-26 06:46:48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,10 +6,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_TEST_CXX_DEPENDENCIES("XdmfCore")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add any ldpath directories that the cxx tests may need
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ADD_TEST_CXX_LDPATH("${CMAKE_BINARY_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ADD_TEST_CXX_LDPATH("${CMAKE_BINARY_DIR}/lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add any path directoreis that the Cxx tests may need
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ADD_TEST_CXX_PATH("${CMAKE_BINARY_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ADD_TEST_CXX_PATH("${CMAKE_BINARY_DIR}/bin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add any cxx tests here:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note: We don't want to use a foreach loop to test the files incase we
</span></pre><pre style='margin:0'>
</pre>