Update third-party libraries

thirdparty/EVPath/CMakeLists.txt

@@ -5,6 +5,8 @@ set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_CMAKEDIR}/thirdparty")
 
 set(EVPATH_LIBRARY_PREFIX adios2_ CACHE INTERNAL "")
 set(EVPATH_QUIET ON CACHE INTERNAL "")
+set(EVPATH_INSTALL_HEADERS OFF CACHE INTERNAL "")
+set(EVPATH_INSTALL_PKGCONFIG OFF CACHE INTERNAL "")
 
 add_subdirectory(EVPath)
 set(EVPath_DIR ${CMAKE_CURRENT_BINARY_DIR}/EVPath CACHE INTERNAL "")

thirdparty/EVPath/EVPath/CMakeLists.txt

@@ -15,15 +15,9 @@ if(POLICY CMP0077)
 endif()
 
 # Some boilerplate to setup nice output directories
-set(CMAKE_INSTALL_BINDIR bin CACHE STRING "Installation runtime subdirectory")
-set(CMAKE_INSTALL_LIBDIR lib CACHE STRING "Installation library subdirectory")
-set(CMAKE_INSTALL_INCLUDEDIR include
-  CACHE STRING "Installation include subdirectory")
+include(GNUInstallDirs)
 set(CMAKE_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/EVPath
   CACHE STRING "Installation CMake subdirectory")
-mark_as_advanced(CMAKE_INSTALL_BINDIR)
-mark_as_advanced(CMAKE_INSTALL_LIBDIR)
-mark_as_advanced(CMAKE_INSTALL_INCLUDEDIR)
 mark_as_advanced(CMAKE_INSTALL_CMAKEDIR)
 
 if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
@@ -538,28 +532,36 @@ _pkg_expand_libs("${_pkg_config_libs}" _pkg_config_libs)
 _pkg_expand_libs("${_pkg_config_private_libs}" _pkg_config_private_libs)
 
 # Setup pkgconfig
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/evpath.pc.in
-  ${CMAKE_CURRENT_BINARY_DIR}/evpath.pc
-  @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/evpath.pc
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/evpath_config.in
-  ${CMAKE_CURRENT_BINARY_DIR}/evpath_config
-  @ONLY)
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/evpath_config
-  DESTINATION "${CMAKE_INSTALL_BINDIR}")
-
-install(
-  FILES
-    evpath.h
-    cm_schedule.h
-    ev_dfg.h 
-    cm_transport.h
-    ${CMAKE_CURRENT_BINARY_DIR}/revpath.h 
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-)
+option(EVPATH_INSTALL_PKGCONFIG "Install EVPath pkgconfig files" ON)
+mark_as_advanced(EVPATH_INSTALL_PKGCONFIG)
+if(EVPATH_INSTALL_PKGCONFIG)
+  configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/evpath.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/evpath.pc
+    @ONLY)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/evpath.pc
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+  configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/evpath_config.in
+    ${CMAKE_CURRENT_BINARY_DIR}/evpath_config
+    @ONLY)
+  install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/evpath_config
+    DESTINATION "${CMAKE_INSTALL_BINDIR}")
+endif()
+
+option(EVPATH_INSTALL_HEADERS "Install EVPath header files" ON)
+mark_as_advanced(EVPATH_INSTALL_HEADERS)
+if(EVPATH_INSTALL_HEADERS)
+  install(
+    FILES
+      evpath.h
+      cm_schedule.h
+      ev_dfg.h
+      cm_transport.h
+      ${CMAKE_CURRENT_BINARY_DIR}/revpath.h
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  )
+endif()
 
 install(TARGETS EVPath ${EVPATH_TRANSPORT_TARGETS} EXPORT EVPathTargets
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

thirdparty/atl/CMakeLists.txt

@@ -6,6 +6,8 @@ set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_CMAKEDIR}/thirdparty")
 set(ATL_LIBRARIES_ONLY ON CACHE INTERNAL "")
 set(ATL_QUIET ON CACHE INTERNAL "")
 set(ATL_LIBRARY_PREFIX adios2_ CACHE INTERNAL "")
+set(ATL_INSTALL_HEADERS OFF CACHE INTERNAL "")
+set(ATL_INSTALL_PKGCONFIG OFF CACHE INTERNAL "")
 
 add_subdirectory(atl)
 set(atl_DIR ${CMAKE_CURRENT_BINARY_DIR}/atl CACHE INTERNAL "")

thirdparty/atl/atl/CMakeLists.txt

@@ -3,15 +3,9 @@ cmake_minimum_required(VERSION 3.0)
 project(ATL VERSION 2.2.1 LANGUAGES C)
 
 # Some boilerplate to setup nice output directories
-set(CMAKE_INSTALL_BINDIR bin CACHE STRING "Installation runtime subdirectory")
-set(CMAKE_INSTALL_LIBDIR lib CACHE STRING "Installation library subdirectory")
-set(CMAKE_INSTALL_INCLUDEDIR include
-  CACHE STRING "Installation include subdirectory")
+include(GNUInstallDirs)
 set(CMAKE_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/atl
   CACHE STRING "Installation CMake subdirectory")
-mark_as_advanced(CMAKE_INSTALL_BINDIR)
-mark_as_advanced(CMAKE_INSTALL_LIBDIR)
-mark_as_advanced(CMAKE_INSTALL_INCLUDEDIR)
 mark_as_advanced(CMAKE_INSTALL_CMAKEDIR)
 
 if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
@@ -78,31 +72,42 @@ mark_as_advanced(ATL_LIBRARY_PREFIX)
 
 add_library(atl atom.c attr.c lookup3.c tclHash.c)
 add_library(atl::atl ALIAS atl)
+option(ATL_INSTALL_HEADERS "Install ATL header files" ON)
+mark_as_advanced(ATL_INSTALL_HEADERS)
 set_target_properties(atl PROPERTIES
   OUTPUT_NAME ${ATL_LIBRARY_PREFIX}atl
   VERSION ${ATL_VERSION}
-  SOVERSION ${ATL_VERSION_MAJOR}
-  PUBLIC_HEADER atl.h)
+  SOVERSION ${ATL_VERSION_MAJOR})
+if(ATL_INSTALL_HEADERS)
+  set_target_properties(atl PROPERTIES
+    PUBLIC_HEADER atl.h)
+endif()
 target_include_directories(atl PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 
 # Setup pkgconfig
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/atl.pc.in
-  ${CMAKE_CURRENT_BINARY_DIR}/atl.pc
-  @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/atl.pc
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/atl-config.in
-  ${CMAKE_CURRENT_BINARY_DIR}/atl-config
-  @ONLY)
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/atl-config
-  DESTINATION "${CMAKE_INSTALL_BINDIR}")
+option(ATL_INSTALL_PKGCONFIG "Install ATL pkgconfig files" ON)
+mark_as_advanced(ATL_INSTALL_PKGCONFIG)
+if(ATL_INSTALL_PKGCONFIG)
+  configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/atl.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/atl.pc
+    @ONLY)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/atl.pc
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+  configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/atl-config.in
+    ${CMAKE_CURRENT_BINARY_DIR}/atl-config
+    @ONLY)
+  install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/atl-config
+    DESTINATION "${CMAKE_INSTALL_BINDIR}")
+endif()
 
-install(FILES atl.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+if(ATL_INSTALL_HEADERS)
+  install(FILES atl.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+endif()
 install(TARGETS atl
   # IMPORTANT: Add the foo library to the "export-set"
   EXPORT atl-targets

thirdparty/dill/CMakeLists.txt

@@ -5,6 +5,8 @@ set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_CMAKEDIR}/thirdparty")
 
 set(DILL_QUIET ON CACHE INTERNAL "")
 set(DILL_LIBRARY_PREFIX adios2_ CACHE INTERNAL "")
+set(DILL_INSTALL_HEADERS OFF CACHE INTERNAL "")
+set(DILL_INSTALL_PKGCONFIG OFF CACHE INTERNAL "")
 
 add_subdirectory(dill)
 set(dill_DIR ${CMAKE_CURRENT_BINARY_DIR}/dill CACHE INTERNAL "")

thirdparty/dill/dill/CMakeLists.txt

@@ -3,15 +3,9 @@ cmake_minimum_required(VERSION 3.0)
 project(DILL VERSION 2.4.0 LANGUAGES C CXX)
 
 # Some boilerplate to setup nice output directories
-set(CMAKE_INSTALL_BINDIR bin CACHE STRING "Installation runtime subdirectory")
-set(CMAKE_INSTALL_LIBDIR lib CACHE STRING "Installation library subdirectory")
-set(CMAKE_INSTALL_INCLUDEDIR include
-  CACHE STRING "Installation include subdirectory")
+include(GNUInstallDirs)
 set(CMAKE_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/dill
   CACHE STRING "Installation CMake subdirectory")
-mark_as_advanced(CMAKE_INSTALL_BINDIR)
-mark_as_advanced(CMAKE_INSTALL_LIBDIR)
-mark_as_advanced(CMAKE_INSTALL_INCLUDEDIR)
 mark_as_advanced(CMAKE_INSTALL_CMAKEDIR)
 
 list(INSERT CMAKE_PREFIX_PATH 0 ${CMAKE_INSTALL_PREFIX})
@@ -333,41 +327,49 @@ target_include_directories(dill
 target_link_libraries(dill PRIVATE ${TARGET_DEP_TGT} ${TARGET_DEP_LIBS})
 
 # Setup pkgconfig
-set(_pkg_config_private_libs)
-foreach(L ${PKG_DEP_LIBS})
-  if(L MATCHES "(.*)/?lib(.*)\\.")
-    if(CMAKE_MATCH_1)
-      list(APPEND _pkg_config_private_libs "-L${CMAKE_MATCH_1}")
+option(DILL_INSTALL_PKGCONFIG "Install Dill pkgconfig files" ON)
+mark_as_advanced(DILL_INSTALL_PKGCONFIG)
+if(DILL_INSTALL_PKGCONFIG)
+  set(_pkg_config_private_libs)
+  foreach(L ${PKG_DEP_LIBS})
+    if(L MATCHES "(.*)/?lib(.*)\\.")
+      if(CMAKE_MATCH_1)
+        list(APPEND _pkg_config_private_libs "-L${CMAKE_MATCH_1}")
+      endif()
+      list(APPEND _pkg_config_private_libs "-l${CMAKE_MATCH_2}")
+    elseif(L MATCHES "^-")
+      list(APPEND _pkg_config_private_libs "${L}")
+    else()
+      list(APPEND _pkg_config_private_libs "-l${L}")
     endif()
-    list(APPEND _pkg_config_private_libs "-l${CMAKE_MATCH_2}")
-  elseif(L MATCHES "^-")
-    list(APPEND _pkg_config_private_libs "${L}")
-  else()
-    list(APPEND _pkg_config_private_libs "-l${L}")
+  endforeach()
+  if(_pkg_config_private_libs)
+    list(REMOVE_DUPLICATES _pkg_config_private_libs)
   endif()
-endforeach()
-if(_pkg_config_private_libs)
-  list(REMOVE_DUPLICATES _pkg_config_private_libs)
+  string(REPLACE ";" " " _pkg_config_private_libs "${_pkg_config_private_libs}")
+  string(REPLACE ";" " " _pkg_config_req_pkg "${PKG_DEP_PKG}")
+  configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/dill.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/dill.pc
+    @ONLY
+  )
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dill.pc
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+  configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/dill-config.in
+    ${CMAKE_CURRENT_BINARY_DIR}/dill-config
+    @ONLY
+  )
+  install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/dill-config
+    DESTINATION "${CMAKE_INSTALL_BINDIR}")
 endif()
-string(REPLACE ";" " " _pkg_config_private_libs "${_pkg_config_private_libs}")
-string(REPLACE ";" " " _pkg_config_req_pkg "${PKG_DEP_PKG}")
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/dill.pc.in
-  ${CMAKE_CURRENT_BINARY_DIR}/dill.pc
-  @ONLY
-)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dill.pc
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/dill-config.in
-  ${CMAKE_CURRENT_BINARY_DIR}/dill-config
-  @ONLY
-)
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/dill-config
-  DESTINATION "${CMAKE_INSTALL_BINDIR}")
 
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dill.h"
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+option(DILL_INSTALL_HEADERS "Install Dill header files" ON)
+mark_as_advanced(DILL_INSTALL_HEADERS)
+if(DILL_INSTALL_HEADERS)
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dill.h"
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+endif()
 
 install(TARGETS dill
   # IMPORTANT: Add the dill library to the "export-set"

thirdparty/enet/CMakeLists.txt

@@ -2,6 +2,8 @@ message_start_thirdparty()
 
 set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_CMAKEDIR}/thirdparty")
 set(ENET_LIBRARY_PREFIX adios2_ CACHE INTERNAL "")
+set(ENET_INSTALL_HEADERS OFF CACHE INTERNAL "")
+set(ENET_INSTALL_PKGCONFIG OFF CACHE INTERNAL "")
 
 add_subdirectory(enet)
 set(enet_DIR ${CMAKE_CURRENT_BINARY_DIR}/enet CACHE INTERNAL "")

thirdparty/enet/enet/CMakeLists.txt

@@ -3,15 +3,9 @@ cmake_minimum_required(VERSION 3.3)
 project(ENET VERSION 1.3.14 LANGUAGES C)
 
 # Some boilerplate to setup nice output directories
-set(CMAKE_INSTALL_BINDIR bin CACHE STRING "Installation runtime subdirectory")
-set(CMAKE_INSTALL_LIBDIR lib CACHE STRING "Installation library subdirectory")
-set(CMAKE_INSTALL_INCLUDEDIR include
-  CACHE STRING "Installation include subdirectory")
+include(GNUInstallDirs)
 set(CMAKE_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/enet
   CACHE STRING "Installation CMake subdirectory")
-mark_as_advanced(CMAKE_INSTALL_BINDIR)
-mark_as_advanced(CMAKE_INSTALL_LIBDIR)
-mark_as_advanced(CMAKE_INSTALL_INCLUDEDIR)
 mark_as_advanced(CMAKE_INSTALL_CMAKEDIR)
 
 if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
@@ -109,23 +103,31 @@ target_include_directories(enet PUBLIC
 )
 
 # Setup pkgconfig
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/enet.pc.in
-  ${CMAKE_CURRENT_BINARY_DIR}/enet.pc
-  @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/enet.pc
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/enet-config.in
-  ${CMAKE_CURRENT_BINARY_DIR}/enet-config
-  @ONLY)
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/enet-config
-  DESTINATION "${CMAKE_INSTALL_BINDIR}")
-
-install(DIRECTORY include/enet
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-  FILES_MATCHING PATTERN "*.h"
-)
+option(ENET_INSTALL_PKGCONFIG "Install enet pkgconfig files" ON)
+mark_as_advanced(ENET_INSTALL_PKGCONFIG)
+if(ENET_INSTALL_PKGCONFIG)
+  configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/enet.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/enet.pc
+    @ONLY)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/enet.pc
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+  configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/enet-config.in
+    ${CMAKE_CURRENT_BINARY_DIR}/enet-config
+    @ONLY)
+  install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/enet-config
+    DESTINATION "${CMAKE_INSTALL_BINDIR}")
+endif()
+
+option(ENET_INSTALL_HEADERS "Install enet header files" ON)
+mark_as_advanced(ENET_INSTALL_HEADERS)
+if(ENET_INSTALL_HEADERS)
+  install(DIRECTORY include/enet
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+    FILES_MATCHING PATTERN "*.h"
+  )
+endif()
 install(TARGETS enet
   EXPORT enet-targets
   RUNTIME       DESTINATION "${CMAKE_INSTALL_BINDIR}"

thirdparty/ffs/CMakeLists.txt

@@ -8,6 +8,9 @@ set(FFS_USE_DILL ON CACHE INTERNAL "")
 set(FFS_LIBRARIES_ONLY ON CACHE INTERNAL "")
 set(FFS_QUIET ON CACHE INTERNAL "")
 set(FFS_LIBRARY_PREFIX adios2_ CACHE INTERNAL "")
+set(FFS_INSTALL_HEADERS OFF CACHE INTERNAL "")
+set(FFS_INSTALL_PKGCONFIG OFF CACHE INTERNAL "")
+set(FFS_CONVERSION_GENERATION_DEFAULT OFF CACHE INTERNAL "")
 
 add_subdirectory(ffs)
 set(ffs_DIR ${CMAKE_CURRENT_BINARY_DIR}/ffs CACHE INTERNAL "")