Merge branch 'dreibh/udpping' of github.com:dreibh/hipercontracer int…

…o dreibh/udpping
dreibh · Oct 18, 2024 · 90040a8 · 90040a8
2 parents ec923f2 + a500774
commit 90040a8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/rpm/hipercontracer.spec b/rpm/hipercontracer.spec
@@ -109,7 +109,7 @@ rmdir /var/hipercontracer >/dev/null 2>&1 || true
 %files common
 %{_datadir}/hipercontracer/results-examples/HiPerConTracer.R
 %{_datadir}/hipercontracer/results-examples/*-*.results.*
-%{_datadir}/hipercontracer/results-examples/*/*/*/*-*.hpct.*
+%{_datadir}/hipercontracer/results-examples/*-*.hpct.*
 %{_datadir}/hipercontracer/results-examples/README.md
 %{_datadir}/hipercontracer/results-examples/r-install-dependencies
 %{_datadir}/hipercontracer/results-examples/r-ping-example

diff --git a/src/results-examples/CMakeLists.txt b/src/results-examples/CMakeLists.txt
@@ -31,10 +31,14 @@
 #### EXAMPLES                                                            ####
 #############################################################################
 
-EXECUTE_PROCESS(COMMAND         git ls-files .
-                COMMAND         grep -E "\\.(hpct|results)\\..*$"
-                OUTPUT_VARIABLE EXAMPLE_RESULTS)
-MESSAGE("Example results files: ${EXAMPLE_RESULTS}")
+FILE(GLOB_RECURSE EXAMPLE_RESULTS "*.hpct*" "*.results*")
+
+# This does not work with the tarball package:
+# EXECUTE_PROCESS(COMMAND         git ls-files .
+#                 COMMAND         grep -E "\\.(hpct|results)\\..*$"
+#                 OUTPUT_VARIABLE EXAMPLE_RESULTS)
+# FILE(GLOB_RECURSE EXAMPLE_RESULTS "*.hpct*" "*.results*")
+# MESSAGE("Example results files: ${EXAMPLE_RESULTS}")
 
 INSTALL(FILES HiPerConTracer.R
               ${EXAMPLE_RESULTS}