move EncryptionOperator to plugins dir

CMakeLists.txt

@@ -161,6 +161,7 @@ adios_option(Fortran    "Enable support for Fortran bindings" AUTO)
 adios_option(SysVShMem  "Enable support for SysV Shared Memory IPC on *NIX" AUTO)
 adios_option(Profiling  "Enable support for profiling" AUTO)
 adios_option(Endian_Reverse "Enable support for Little/Big Endian Interoperability" AUTO)
+adios_option(Sodium     "Enable support for Sodium for encryption" AUTO)
 include(${PROJECT_SOURCE_DIR}/cmake/DetectOptions.cmake)
 
 if(ADIOS2_HAVE_CUDA)
@@ -221,7 +222,7 @@ endif()
 
 
 set(ADIOS2_CONFIG_OPTS
-    BP5 DataMan DataSpaces HDF5 HDF5_VOL MHS SST CUDA Fortran MPI Python Blosc BZip2 LIBPRESSIO MGARD PNG SZ ZFP DAOS IME O_DIRECT SysVShMem ZeroMQ Profiling Endian_Reverse
+    BP5 DataMan DataSpaces HDF5 HDF5_VOL MHS SST CUDA Fortran MPI Python Blosc BZip2 LIBPRESSIO MGARD PNG SZ ZFP DAOS IME O_DIRECT SysVShMem ZeroMQ Profiling Endian_Reverse Sodium
 )
 
 GenerateADIOSHeaderConfig(${ADIOS2_CONFIG_OPTS})
@@ -286,6 +287,11 @@ add_subdirectory(source)
 #------------------------------------------------------------------------------#
 add_subdirectory(bindings)
 
+#------------------------------------------------------------------------------#
+# Plugins
+#------------------------------------------------------------------------------#
+add_subdirectory(plugins)
+
 #------------------------------------------------------------------------------#
 # Examples
 #------------------------------------------------------------------------------#

cmake/DetectOptions.cmake

@@ -403,6 +403,16 @@ if(ADIOS2_USE_Endian_Reverse STREQUAL ON)
   set(ADIOS2_HAVE_Endian_Reverse TRUE)
 endif()
 
+# Sodium for EncryptionOperator
+if(ADIOS2_USE_Sodium STREQUAL AUTO)
+  find_package(Sodium)
+elseif(ADIOS2_USE_Sodium)
+  find_package(Sodium REQUIRED)
+endif()
+if(Sodium_FOUND)
+  set(ADIOS2_HAVE_Sodium TRUE)
+endif()
+
 # Multithreading
 find_package(Threads REQUIRED)
 

cmake/adios2-config-common.cmake.in

@@ -127,6 +127,11 @@ if(NOT @BUILD_SHARED_LIBS@)
     find_dependency(HDF5 COMPONENTS C)
   endif()
 
+  set(ADIOS2_HAVE_Sodium @ADIOS2_HAVE_Sodium@)
+  if(ADIOS2_HAVE_Sodium)
+    find_dependency(Sodium)
+  endif()
+
   adios2_add_thirdparty_target(pugixml)
   set(ADIOS2_USE_EXTERNAL_PUGIXML @ADIOS2_USE_EXTERNAL_PUGIXML@)
   if(ADIOS2_USE_EXTERNAL_PUGIXML)

examples/plugins/operator/CMakeLists.txt

@@ -2,15 +2,6 @@
 # Distributed under the OSI-approved Apache License, Version 2.0.  See
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
-
-list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_SOURCE_DIR})
-find_package(Sodium 1.8 REQUIRED)
-
-add_library(EncryptionOperator
-  EncryptionOperator.cpp
-)
-target_link_libraries(EncryptionOperator adios2::cxx11 adios2_core sodium)
-
 add_executable(exampleOperatorPlugin_write
   examplePluginOperator_write.cpp
 )

plugins/CMakeLists.txt

@@ -0,0 +1,16 @@
+#------------------------------------------------------------------------------#
+# Distributed under the OSI-approved Apache License, Version 2.0.  See
+# accompanying file Copyright.txt for details.
+#------------------------------------------------------------------------------#
+
+if(ADIOS2_HAVE_Sodium)
+  add_library(EncryptionOperator
+    EncryptionOperator.cpp
+  )
+  target_link_libraries(EncryptionOperator adios2_core sodium)
+  install(TARGETS EncryptionOperator  EXPORT adios2Exports
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT adios2_core-runtime
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT adios2_core-libraries NAMELINK_COMPONENT adios2_core-development
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT adios2_core-development
+)
+endif()

testing/install/CMakeLists.txt

@@ -110,4 +110,7 @@ if(NOT WIN32)
   endif()
 endif()
 
-add_install_cmake_test(plugin)
+add_install_cmake_test(EnginePlugin)
+if(ADIOS2_HAVE_Sodium)
+  add_install_cmake_test(EncryptionOperator)
+endif()

testing/install/EncryptionOperator/CMakeLists.txt

@@ -0,0 +1,32 @@
+#------------------------------------------------------------------------------#
+# Distributed under the OSI-approved Apache License, Version 2.0.  See
+# accompanying file Copyright.txt for details.
+#------------------------------------------------------------------------------#
+
+cmake_minimum_required(VERSION 3.6)
+project(adios_operator_plugin_test CXX)
+enable_testing()
+
+find_package(adios2 REQUIRED)
+
+option(BUILD_SHARED_LIBS "build shared libs" ON)
+
+set(ENV{ADIOS2_PLUGIN_PATH} "${adios2_DIR}/../../")
+
+#---------- Operator Plugin Tests
+
+# add write test
+add_executable(adios_plugin_operator_write_test
+  ../../../examples/plugins/operator/examplePluginOperator_write.cpp
+)
+target_link_libraries(adios_plugin_operator_write_test adios2::cxx11)
+add_test(NAME adios_plugin_operator_write_test COMMAND adios_plugin_operator_write_test)
+
+# add read test
+add_executable(adios_plugin_operator_read_test
+  ../../../examples/plugins/operator/examplePluginOperator_read.cpp
+)
+target_link_libraries(adios_plugin_operator_read_test adios2::cxx11)
+add_test(NAME adios_plugin_operator_read_test COMMAND adios_plugin_operator_read_test)
+set_tests_properties(adios_plugin_operator_read_test PROPERTIES
+    DEPENDS adios_plugin_operator_write_test)

testing/install/plugin/CMakeLists.txt → testing/install/EnginePlugin/CMakeLists.txt

@@ -39,28 +39,3 @@ add_test(NAME adios_plugin_engine_read_test COMMAND adios_plugin_engine_read_tes
 set_tests_properties(adios_plugin_engine_read_test PROPERTIES
     DEPENDS adios_plugin_engine_write_test)
 
-#---------- Operator Plugin Tests
-
-list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_SOURCE_DIR}/../../../examples/plugins/operator)
-find_package(Sodium 1.8 REQUIRED)
-
-add_library(EncryptionOperator
-    ../../../examples/plugins/operator/EncryptionOperator.cpp
-)
-target_link_libraries(EncryptionOperator adios2::cxx11 adios2::core sodium)
-
-# add write test
-add_executable(adios_plugin_operator_write_test
-  ../../../examples/plugins/operator/examplePluginOperator_write.cpp
-)
-target_link_libraries(adios_plugin_operator_write_test adios2::cxx11)
-add_test(NAME adios_plugin_operator_write_test COMMAND adios_plugin_operator_write_test)
-
-# add read test
-add_executable(adios_plugin_operator_read_test
-  ../../../examples/plugins/operator/examplePluginOperator_read.cpp
-)
-target_link_libraries(adios_plugin_operator_read_test adios2::cxx11)
-add_test(NAME adios_plugin_operator_read_test COMMAND adios_plugin_operator_read_test)
-set_tests_properties(adios_plugin_operator_read_test PROPERTIES
-    DEPENDS adios_plugin_operator_write_test)