Merge pull request #280 from chuckatkins/fix-zmq-cmake-config

Fix zmq cmake config

CMakeLists.txt

@@ -99,8 +99,10 @@ if(ADIOS2_HAVE_MPI)
   add_definitions(-DOMPI_SKIP_MPICXX -DMPICH_SKIP_MPICXX)
 endif()
 
-GenerateADIOSHeaderConfig(MPI ZFP BZip2 ADIOS1 HDF5 DataMan Python Fortran 
-                          SysVShMem)
+set(ADIOS2_CONFIG_OPTS
+  BZip2 ZFP MPI DataMan ZeroMQ HDF5 ADIOS1 Python Fortran SysVShMem
+)
+GenerateADIOSHeaderConfig(${ADIOS2_CONFIG_OPTS})
 
 install(FILES ${ADIOS2_BINARY_DIR}/source/adios2/ADIOSConfig.h
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/adios2
@@ -188,7 +190,7 @@ message("    Build Type:   ${CMAKE_BUILD_TYPE}")
 message("    Testing: ${BUILD_TESTING}")
 message("    Build Options:")
 
-foreach(opt BZip2 ZFP MPI DataMan ZeroMQ HDF5 ADIOS1 Python Fortran SysVShMem)
+foreach(opt IN LISTS ADIOS2_CONFIG_OPTS)
   message_pad("      ${opt}" 15 label)
   if(${ADIOS2_HAVE_${opt}})
     message("${label}: ON")

cmake/ADIOSFunctions.cmake

@@ -40,8 +40,13 @@ function(python_add_test)
 endfunction()
 
 function(GenerateADIOSHeaderConfig)
+  set(ADIOS2_CONFIG_DEFINES)
   foreach(OPT IN LISTS ARGN)
     string(TOUPPER ${OPT} OPT_UPPER)
+    string(APPEND ADIOS2_CONFIG_DEFINES "
+/* CMake Option: ADIOS_USE_${OPT}=OFF */
+#cmakedefine ADIOS2_HAVE_${OPT_UPPER}
+")
     if(ADIOS2_HAVE_${OPT})
       set(ADIOS2_HAVE_${OPT_UPPER} 1)
     else()
@@ -51,6 +56,10 @@ function(GenerateADIOSHeaderConfig)
 
   configure_file(
     ${ADIOS2_SOURCE_DIR}/source/adios2/ADIOSConfig.h.in
+    ${ADIOS2_BINARY_DIR}/source/adios2/ADIOSConfig.h.in
+  )
+  configure_file(
+    ${ADIOS2_BINARY_DIR}/source/adios2/ADIOSConfig.h.in
     ${ADIOS2_BINARY_DIR}/source/adios2/ADIOSConfig.h
   )
 endfunction()

source/adios2/ADIOSConfig.h.in

@@ -24,33 +24,8 @@
  *     Id: @CMAKE_Fortran_COMPILER_ID@ @CMAKE_CXX_COMPILER_VERSION@
  */
 
-/* CMake Option: ADIOS_USE_MPI=OFF */
-#cmakedefine ADIOS2_HAVE_MPI
+/* Everything past this line is programatically generated */
 
-/* CMake Option: ADIOS_USE_ZFP=ON */
-#cmakedefine ADIOS2_HAVE_ZFP
-
-/* CMake Option: ADIOS_USE_BZip2=ON */
-#cmakedefine ADIOS2_HAVE_BZIP2
-
-/* CMake Option: ADIOS_USE_ADIOS1=ON */
-#cmakedefine ADIOS2_HAVE_ADIOS1
-
-/* CMake Option: ADIOS_USE_HDF5=ON */
-#cmakedefine ADIOS2_HAVE_HDF5
-
-/* CMake Option: ADIOS_USE_ZeroMQ=ON */
-#cmakedefine ADIOS2_HAVE_ZEROMQ
-
-/* CMake Option: ADIOS_USE_SysVShMem=ON */
-#cmakedefine ADIOS2_HAVE_SYSVSHMEM
-
-/* Optional Language Bindings: */
-
-/* CMake Option: ADIOS_USE_Python=ON */
-#cmakedefine ADIOS2_HAVE_PYTHON
-
-/* CMake Option: ADIOS_USE_Fortran=ON */
-#cmakedefine ADIOS2_HAVE_FORTRAN
+@ADIOS2_CONFIG_DEFINES@
 
 #endif /* ADIOSCONFIG_H_ */