removed ebool code from the mainline

Update #548
ess-dmsc · Dec 27, 2021 · 7e40f27 · 7e40f27
1 parent 8d6e961
commit 7e40f27
Show file tree

Hide file tree

Showing 18 changed files with 519 additions and 175 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,6 +39,12 @@ elseif(NOT ${CONAN} MATCHES "DISABLE")
   message(FATAL_ERROR "Unrecognised option for CONAN (${CONAN}), use AUTO, MANUAL or DISABLE")
 endif()
 
+#=============================================================================
+# contrib extensions
+#=============================================================================
+set(H5CPP_ENABLE_NEXUS "false" CACHE BOOL "enable support or Nexus types")
+set(H5CPP_ENABLE_STL "true" CACHE BOOL "enable STL support for H5CPP")
+
 #=============================================================================
 # General configuration
 #=============================================================================

diff --git a/src/h5cpp/contrib/CMakeLists.txt b/src/h5cpp/contrib/CMakeLists.txt
@@ -1 +1,7 @@
-add_subdirectory(stl)
+if(H5CPP_ENABLE_STL)
+    add_subdirectory(stl)
+endif()
+
+if(H5CPP_ENABLE_NEXUS)
+    add_subdirectory(nexus)
+endif()
diff --git a/src/h5cpp/contrib/nexus/CMakeLists.txt b/src/h5cpp/contrib/nexus/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/ebool.cpp)
+set(HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/ebool.hpp)
+
+install(FILES ${HEADERS}
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/h5cpp/contrib/nexus)
+
+set(h5cpp_sources ${h5cpp_sources} ${SOURCES} PARENT_SCOPE)
+set(h5cpp_headers ${h5cpp_headers} ${HEADERS} PARENT_SCOPE)
diff --git a/src/h5cpp/datatype/ebool.cpp → src/h5cpp/contrib/nexus/ebool.cpp b/src/h5cpp/datatype/ebool.cpp → src/h5cpp/contrib/nexus/ebool.cpp
diff --git a/src/h5cpp/datatype/ebool.hpp → src/h5cpp/contrib/nexus/ebool.hpp b/src/h5cpp/datatype/ebool.hpp → src/h5cpp/contrib/nexus/ebool.hpp
diff --git a/src/h5cpp/contrib/stl/CMakeLists.txt b/src/h5cpp/contrib/stl/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/array.hpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/complex.hpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/stl.hpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/string.hpp
+            ${CMAKE_CURRENT_SOURCE_DIR}/vector.hpp)
+
+install(FILES ${HEADERS}
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/h5cpp/contrib/stl)
+
+set(h5cpp_headers ${h5cpp_headers} ${HEADERS} PARENT_SCOPE)
diff --git a/src/h5cpp/datatype/CMakeLists.txt b/src/h5cpp/datatype/CMakeLists.txt
@@ -9,7 +9,6 @@ set(SOURCES
     ${dir}/string.cpp
     ${dir}/types.cpp
     ${dir}/enum.cpp
-    ${dir}/ebool.cpp
     )
 
 set(HEADERS
@@ -23,7 +22,6 @@ set(HEADERS
     ${dir}/string.hpp
     ${dir}/array.hpp
     ${dir}/enum.hpp
-    ${dir}/ebool.hpp
     )
 
 install(FILES ${HEADERS}

diff --git a/src/h5cpp/hdf5.hpp b/src/h5cpp/hdf5.hpp
@@ -45,7 +45,6 @@
 
 #include <h5cpp/datatype/compound.hpp>
 #include <h5cpp/datatype/datatype.hpp>
-#include <h5cpp/datatype/ebool.hpp>
 #include <h5cpp/datatype/factory.hpp>
 #include <h5cpp/datatype/float.hpp>
 #include <h5cpp/datatype/integer.hpp>

diff --git a/test/attribute/CMakeLists.txt b/test/attribute/CMakeLists.txt
@@ -6,8 +6,7 @@ set(test_sources
     attribute_multidim_io_test.cpp
     attribute_fixed_string_io.cpp
     attribute_variable_string_io.cpp
-    attribute_h5py_bool_test.cpp
-    attribute_pniio_bool_test.cpp)
+    )
 
 add_executable(attribute_test ${test_sources})
 target_link_libraries(attribute_test h5cpp)

diff --git a/test/contrib/nexus/CMakeLists.txt b/test/contrib/nexus/CMakeLists.txt
diff --git a/test/attribute/attribute_h5py_bool_test.cpp → ...ontrib/nexus/attribute_h5py_bool_test.cpp b/test/attribute/attribute_h5py_bool_test.cpp → ...ontrib/nexus/attribute_h5py_bool_test.cpp
diff --git a/test/attribute/attribute_pniio_bool_test.cpp → ...ntrib/nexus/attribute_pniio_bool_test.cpp b/test/attribute/attribute_pniio_bool_test.cpp → ...ntrib/nexus/attribute_pniio_bool_test.cpp
diff --git a/test/node/dataset_h5py_bool_test.cpp → .../contrib/nexus/dataset_h5py_bool_test.cpp b/test/node/dataset_h5py_bool_test.cpp → .../contrib/nexus/dataset_h5py_bool_test.cpp
diff --git a/test/node/dataset_pniio_bool_test.cpp → ...contrib/nexus/dataset_pniio_bool_test.cpp b/test/node/dataset_pniio_bool_test.cpp → ...contrib/nexus/dataset_pniio_bool_test.cpp