Merge b32e056 into be29b49

HDFGroup · Feb 4, 2022 · 8d45638 · 8d45638
2 parents be29b49 + b32e056
commit 8d45638
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 26 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -65,6 +65,9 @@ jobs:
       - name: Build and Test
         run: ci/install_hermes.sh
 
+      - name: Install
+        run: pushd build && make install && popd
+
       # Enable tmate debugging of manually-triggered workflows if the input option was provided
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3

diff --git a/adapter/test/mpiio/CMakeLists.txt b/adapter/test/mpiio/CMakeLists.txt
@@ -15,8 +15,8 @@ set(MPIIO_TESTS
 )
 
 foreach(program ${MPIIO_TESTS})
-  target_include_directories(${program} PUBLIC ${HERMES_ADAPTER_DIR})
-  target_include_directories(${program} PUBLIC ${HERMES_ADAPTER_TEST_DIR})
+  target_include_directories(${program} PRIVATE ${HERMES_ADAPTER_DIR})
+  target_include_directories(${program} PRIVATE ${HERMES_ADAPTER_TEST_DIR})
   target_link_libraries(${program} Catch2::Catch2 -lstdc++fs -lc MPI::MPI_CXX)
 endforeach()
 
@@ -25,8 +25,6 @@ if(HERMES_INSTALL_TESTS)
     install(
       TARGETS
       ${program}
-      EXPORT
-      ${HERMES_EXPORTED_TARGETS}
       LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
       ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
       RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}

diff --git a/adapter/test/posix/CMakeLists.txt b/adapter/test/posix/CMakeLists.txt
@@ -51,8 +51,8 @@ set(POSIX_TESTS
 )
 
 foreach(program ${POSIX_TESTS})
-  target_include_directories(${program} PUBLIC ${HERMES_ADAPTER_DIR})
-  target_include_directories(${program} PUBLIC ${HERMES_ADAPTER_TEST_DIR})
+  target_include_directories(${program} PRIVATE ${HERMES_ADAPTER_DIR})
+  target_include_directories(${program} PRIVATE ${HERMES_ADAPTER_TEST_DIR})
   target_link_libraries(${program} Catch2::Catch2 -lstdc++fs -lc MPI::MPI_CXX)
 endforeach()
 
@@ -61,8 +61,6 @@ if(HERMES_INSTALL_TESTS)
         install(
                 TARGETS
                 ${program}
-                EXPORT
-                ${HERMES_EXPORTED_TARGETS}
                 LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
                 ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
                 RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}

diff --git a/adapter/test/pubsub/CMakeLists.txt b/adapter/test/pubsub/CMakeLists.txt
@@ -32,20 +32,18 @@ foreach(program ${MULTI_NODE_PUBSUB_TESTS})
 endforeach()
 
 foreach(program ${EXTENDED_PUBSUB_TESTS})
-    target_include_directories(${program} PUBLIC ${HERMES_ADAPTER_DIR})
-    target_include_directories(${program} PUBLIC ${HERMES_ADAPTER_TEST_DIR})
+    target_include_directories(${program} PRIVATE ${HERMES_ADAPTER_DIR})
+    target_include_directories(${program} PRIVATE ${HERMES_ADAPTER_TEST_DIR})
 endforeach()
 
 if(HERMES_INSTALL_TESTS)
     foreach(program ${EXTENDED_PUBSUB_TESTS})
         install(
                 TARGETS
                 ${program}
-                EXPORT
-                ${HERMES_EXPORTED_TARGETS}
                 LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
                 ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
                 RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}
         )
     endforeach()
-endif()
+endif()
diff --git a/adapter/test/stdio/CMakeLists.txt b/adapter/test/stdio/CMakeLists.txt
@@ -93,8 +93,8 @@ set(STDIO_TESTS
 )
 
 foreach(program ${STDIO_TESTS})
-  target_include_directories(${program} PUBLIC ${HERMES_ADAPTER_DIR})
-  target_include_directories(${program} PUBLIC ${HERMES_ADAPTER_TEST_DIR})
+  target_include_directories(${program} PRIVATE ${HERMES_ADAPTER_DIR})
+  target_include_directories(${program} PRIVATE ${HERMES_ADAPTER_TEST_DIR})
   target_link_libraries(${program} Catch2::Catch2 -lstdc++fs -lc MPI::MPI_CXX)
 endforeach()
 
@@ -103,8 +103,6 @@ if(HERMES_INSTALL_TESTS)
         install(
                 TARGETS
                 ${program}
-                EXPORT
-                ${HERMES_EXPORTED_TARGETS}
                 LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
                 ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
                 RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}

diff --git a/adapter/test/vfd/CMakeLists.txt b/adapter/test/vfd/CMakeLists.txt
@@ -11,13 +11,13 @@ foreach(vfd_test ${hermes_vfd_tests})
   target_include_directories(${vfd_test}
     SYSTEM PUBLIC ${HDF5_HERMES_VFD_EXT_INCLUDE_DEPENDENCIES}
   )
-target_link_libraries(${vfd_test}
-  MPI::MPI_CXX
-  hermes
-  ${HDF5_HERMES_VFD_EXPORTED_LIBS}
-  ${HDF5_HERMES_VFD_EXT_LIB_DEPENDENCIES}
-  ${HDF5_HERMES_VFD_EXT_PKG_DEPENDENCIES}
-)
+  target_link_libraries(${vfd_test}
+    MPI::MPI_CXX
+    hermes
+    ${HDF5_HERMES_VFD_EXPORTED_LIBS}
+    ${HDF5_HERMES_VFD_EXT_LIB_DEPENDENCIES}
+    ${HDF5_HERMES_VFD_EXT_PKG_DEPENDENCIES}
+  )
   add_test(NAME "Test${vfd_test}" COMMAND ${vfd_test})
   set_property(TEST "Test${vfd_test}"
     PROPERTY ENVIRONMENT HERMES_CONF=${CMAKE_CURRENT_SOURCE_DIR}/hermes.conf)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -158,8 +158,6 @@ if(HERMES_INSTALL_TESTS)
     install(
             TARGETS
             ${program}
-            EXPORT
-            ${HERMES_EXPORTED_TARGETS}
             LIBRARY DESTINATION ${HERMES_INSTALL_LIB_DIR}
             ARCHIVE DESTINATION ${HERMES_INSTALL_LIB_DIR}
             RUNTIME DESTINATION ${HERMES_INSTALL_BIN_DIR}