Commit ff356d07 authored by Atkins, Charles Vernon's avatar Atkins, Charles Vernon
Browse files

Fix CMake package exports for external sst deps

parent cbea32f9

cmake/ADIOS2Config.cmake.in

+4 −13
Original line number Diff line number Diff line 
list(INSERT CMAKE_MODULE_PATH 0 "@ADIOS2_SOURCE_DIR@/cmake")



if(@ADIOS2_HAVE_SST@ AND NOT @ADIOS2_USE_SYSTEM_EVPath@)

  if(NOT @ADIOS2_USE_SYSTEM_ATL@)

if(@ADIOS2_HAVE_SST@)

  set(EVPath_DIR @EVPath_DIR@)

  if(NOT @BUILD_SHARED_LIBS@)

    set(atl_DIR @atl_DIR@)

  endif()



  if(NOT @ADIOS2_USE_SYSTEM_FFS@)

    if(NOT @ADIOS2_USE_SYSTEM_DILL@)

    set(dill_DIR @dill_DIR@)

    endif()

    set(ffs_DIR @ffs_DIR@)

  endif()



  if(NOT @ADIOS2_USE_SYSTEM_ENET@)

    set(enet_DIR @enet_DIR@)

  endif()



  set(EVPath_DIR @EVPath_DIR@)

endif()



include("${CMAKE_CURRENT_LIST_DIR}/ADIOS2ConfigCommon.cmake")

cmake/ADIOS2ConfigCommon.cmake.in

+13 −2
Original line number Diff line number Diff line 
cmake_minimum_required(VERSION 3.5)

cmake_minimum_required(VERSION 3.6)



if(POLICY CMP0074)

  cmake_policy(SET CMP0074 NEW)

endif()



include(CMakeFindDependencyMacro)
@@ -15,6 +19,9 @@ if(ADIOS2_HAVE_MPI) 
endif()



if(NOT @BUILD_SHARED_LIBS@)

  # Setup dummy interface targets for the private compile-time dependencies

  add_library(adios2::thirdparty::nlohmann_json INTERFACE IMPORTED)



  set(ADIOS2_HAVE_BZip2 @ADIOS2_HAVE_BZip2@)

  if(ADIOS2_HAVE_BZip2)

    find_dependency(BZip2)
@@ -43,6 +50,10 @@ if(NOT @BUILD_SHARED_LIBS@) 
  set(ADIOS2_HAVE_SST @ADIOS2_HAVE_SST@)

  if(ADIOS2_HAVE_SST)

    find_dependency(EVPath COMPONENTS C)

    add_library(adios2::thirdparty::EVPath INTERFACE IMPORTED)

    set_target_properties(adios2::thirdparty::EVPath PROPERTIES

      INTERFACE_LINK_LIBRARIES EVPath::EVPath

    )

  endif()



endif()
@@ -51,7 +62,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/ADIOS2ConfigVersion.cmake") 


include(FindPackageHandleStandardArgs)

set(ADIOS2_CONFIG "${CMAKE_CURRENT_LIST_FILE}")

find_package_handle_standard_args(ADIOS2 DEFAULT_MESSAGE ADIOS2_VERSION)

find_package_handle_standard_args(ADIOS2 CONFIG_MODE)



if(NOT TARGET adios2::adios2)

  include("${CMAKE_CURRENT_LIST_DIR}/ADIOS2Targets.cmake")

cmake/ADIOS2ConfigInstall.cmake.in

+5 −5
Original line number Diff line number Diff line 
list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}/Modules")



if(@ADIOS2_HAVE_SST@ AND NOT @ADIOS2_USE_SYSTEM_EVPath@)

  if(NOT @ADIOS2_USE_SYSTEM_ATL@)

if(@ADIOS2_HAVE_SST@ AND NOT @ADIOS2_USE_EXTERNAL_EVPath@)

  if(NOT @ADIOS2_USE_EXTERNAL_ATL@)

    set(atl_DIR @CMAKE_INSTALL_CMAKEDIR@/deps)

  endif()



  if(NOT @ADIOS2_USE_SYSTEM_FFS@)

    if(NOT @ADIOS2_USE_SYSTEM_DILL@)

  if(NOT @ADIOS2_USE_EXTERNAL_FFS@)

    if(NOT @ADIOS2_USE_EXTERNAL_DILL@)

      set(dill_DIR @CMAKE_INSTALL_CMAKEDIR@/deps)

    endif()

    set(ffs_DIR @CMAKE_INSTALL_CMAKEDIR@/deps)

  endif()



  if(NOT @ADIOS2_USE_SYSTEM_ENET@)

  if(NOT @ADIOS2_USE_EXTERNAL_ENET@)

    set(enet_DIR @CMAKE_INSTALL_CMAKEDIR@/deps)

  endif()