Vendored headers installed to include/JANA/external

JeffersonLab · Aug 2, 2024 · 8e16f9f · 8e16f9f
1 parent c8c9614
commit 8e16f9f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/scripts/jana-generate.py b/scripts/jana-generate.py
@@ -936,7 +936,7 @@ def build_plugin_test(plugin_name, copy_catch_hpp=True, dir="."):
 
     if copy_catch_hpp:
         files_to_copy = {"catch.hpp": {"sourcedir": "src/external",
-                                       "installdir": "include/external",
+                                       "installdir": "include/JANA/external",
                                        "destname": dir+"/catch.hpp"}}
         copy_from_source_dir(files_to_copy)
 
@@ -960,7 +960,7 @@ def build_jeventprocessor_test(processor_name, is_mini=True, copy_catch_hpp=True
 
     if copy_catch_hpp:
         files_to_copy = {"catch.hpp": {"sourcedir": "src/external",
-                                       "installdir": "include/external",
+                                       "installdir": "include/JANA/external",
                                        "destname": dir+"/catch.hpp"}}
         copy_from_source_dir(files_to_copy)
 

diff --git a/src/programs/unit_tests/CMakeLists.txt b/src/programs/unit_tests/CMakeLists.txt
@@ -60,4 +60,4 @@ if (${USE_PODIO})
 endif()
 
 install(TARGETS jana-unit-tests DESTINATION bin)
-install(FILES ../../external/catch.hpp DESTINATION include/external)
+install(FILES ../../external/catch.hpp DESTINATION include/JANA/external)