From 84e1a29a939a88a17f1365c8a781859cb7f7d452 Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Thu, 20 Apr 2017 11:29:58 -0400
Subject: [PATCH] Added a stub entry in both ADIOS and DataMan for ZFP support
---
CMakeLists.txt | 6 ++++--
source/adios2/CMakeLists.txt | 6 ++++++
source/dataman/CMakeLists.txt | 9 +++++++++
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 876318ced..3d8b020a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,6 +71,7 @@ if(ADIOS_USE_MPI)
add_definitions(-DOMPI_SKIP_MPICXX)
endif()
option(ADIOS_USE_BZip2 "Enable support for BZip2 transforms" OFF)
+option(ADIOS_USE_ZFP "Enable support for ZFP transforms" OFF)
option(ADIOS_USE_ADIOS1 "Enable support for the ADIOS 1 engine" OFF)
option(ADIOS_USE_HDF5 "Enable support for the HDF5 engine" OFF)
@@ -79,7 +80,7 @@ option(ADIOS_USE_HDF5 "Enable support for the HDF5 engine" OFF)
set(ADIOS_USE_DataMan ${SHARED_LIBS_SUPPORTED})
include(GenerateADIOSConfig)
-GenerateADIOSConfig(MPI BZip2 ADIOS1 HDF5 DataMan)
+GenerateADIOSConfig(MPI ZFP BZip2 ADIOS1 HDF5 DataMan)
install(
FILES ${ADIOS_BINARY_DIR}/adios2/ADIOSConfig.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/adios2
@@ -123,7 +124,7 @@ message("")
message("ADIOS2 build configuration:")
message(" ADIOS Version: ${ADIOS_VERSION}")
message(" C++ Compiler : ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} ${CMAKE_CXX_COMPILER_WRAPPER}")
-message(" ${CMAKE_CXX_COMPILER}")
+message(" ${CMAKE_CXX_COMPILER}")
message("")
message(" Installation prefix: ${CMAKE_INSTALL_PREFIX}")
message(" Features:")
@@ -136,6 +137,7 @@ message(" Build Type: ${CMAKE_BUILD_TYPE}")
message(" Testing: ${BUILD_TESTING}")
message(" MPI: ${ADIOS_USE_MPI}")
message(" BZip2: ${ADIOS_USE_BZip2}")
+message(" ZFP: ${ADIOS_USE_ZFP}")
message(" ADIOS1: ${ADIOS_USE_ADIOS1}")
message(" DataMan: ${ADIOS_USE_DataMan}")
message(" HDF5: ${ADIOS_USE_HDF5}")
diff --git a/source/adios2/CMakeLists.txt b/source/adios2/CMakeLists.txt
index 7ed5b2ea3..40c083af8 100644
--- a/source/adios2/CMakeLists.txt
+++ b/source/adios2/CMakeLists.txt
@@ -57,6 +57,12 @@ if(ADIOS_USE_BZip2)
target_link_libraries(adios2 PRIVATE BZip2::BZip2)
endif()
+#if(ADIOS_USE_ZFP)
+# find_package(ZFP REQUIRED)
+# target_sources(adios2 PRIVATE transform/ZFP.cpp)
+# target_link_libraries(adios2 PRIVATE zfp::zfp)
+#endif()
+
if(ADIOS_USE_MPI)
find_package(MPI COMPONENTS C REQUIRED)
target_include_directories(adios2 PUBLIC ${MPI_C_INCLUDE_PATH})
diff --git a/source/dataman/CMakeLists.txt b/source/dataman/CMakeLists.txt
index 635539941..3aa6a1654 100644
--- a/source/dataman/CMakeLists.txt
+++ b/source/dataman/CMakeLists.txt
@@ -31,6 +31,15 @@ list(APPEND dataman_targets cacheman)
# list(APPEND dataman_targets zmqman)
#endif()
+#if(ADIOS_USE_ZFP)
+# find_package(ZFP REQUIRED)
+#
+# add_library(zfpman MODULE ZfpMan.h ZfpMan.cpp)
+# target_link_libraries(zfpman PRIVATE dataman zfp::zfp)
+#
+# list(APPEND dataman_targets zfpman)
+#endif()
+
install(
TARGETS ${dataman_targets} EXPORT adios2
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--
GitLab