Merge pull request #952 from JasonRuonanWang/dataman-cmake

added option for turning DataMan off
ornladios · Oct 26, 2018 · 7d70a48 · 7d70a48
2 parents 053a094 + c3c6df1
commit 7d70a48
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -122,6 +122,7 @@ adios_option(BZip2     "Enable support for BZip2 transforms" AUTO)
 adios_option(ZFP       "Enable support for ZFP transforms" AUTO)
 adios_option(SZ        "Enable support for SZ transforms" AUTO)
 adios_option(MPI       "Enable support for MPI" AUTO)
+adios_option(DataMan   "Enable support for DataMan" AUTO)
 adios_option(SST       "Enable support for SST" AUTO)
 adios_option(ZeroMQ    "Enable support for ZeroMQ" AUTO)
 adios_option(HDF5      "Enable support for the HDF5 engine" AUTO)

diff --git a/cmake/DetectOptions.cmake b/cmake/DetectOptions.cmake
@@ -73,7 +73,11 @@ endif()
 # DataMan
 # DataMan currently breaks the PGI compiler
 if(NOT (CMAKE_CXX_COMPILER_ID STREQUAL "PGI") AND NOT MSVC)
-  set(ADIOS2_HAVE_DataMan TRUE)
+    if(ADIOS2_USE_DataMan STREQUAL AUTO)
+        set(ADIOS2_HAVE_DataMan TRUE)
+    elseif(ADIOS2_USE_DataMan)
+        set(ADIOS2_HAVE_DataMan TRUE)
+    endif()
 endif()
 
 # ZeroMQ