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

Fix CMake packaging info for internal third party libs

parent ddfaf5ca

cmake/ADIOS2ConfigInstall.cmake.in

+12 −9
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_EXTERNAL_EVPath@)

if(NOT @BUILD_SHARED_LIBS@)

  if(NOT @ADIOS2_USE_EXTERNAL_EVPATH@)

    set(EVPath_DIR ${CMAKE_CURRENT_LIST_DIR}/deps)

  endif()



  if(NOT @ADIOS2_USE_EXTERNAL_ATL@)

    set(atl_DIR @CMAKE_INSTALL_CMAKEDIR@/deps)

    set(atl_DIR ${CMAKE_CURRENT_LIST_DIR}/deps)

  endif()



  if(NOT @ADIOS2_USE_EXTERNAL_FFS@)

  if(NOT @ADIOS2_USE_EXTERNAL_DILL@)

      set(dill_DIR @CMAKE_INSTALL_CMAKEDIR@/deps)

    set(dill_DIR ${CMAKE_CURRENT_LIST_DIR}/deps)

  endif()

    set(ffs_DIR @CMAKE_INSTALL_CMAKEDIR@/deps)



  if(NOT @ADIOS2_USE_EXTERNAL_FFS@)

    set(ffs_DIR ${CMAKE_CURRENT_LIST_DIR}/deps)

  endif()



  if(NOT @ADIOS2_USE_EXTERNAL_ENET@)

    set(enet_DIR @CMAKE_INSTALL_CMAKEDIR@/deps)

    set(enet_DIR ${CMAKE_CURRENT_LIST_DIR}/deps)

  endif()



  set(EVPath_DIR @CMAKE_INSTALL_CMAKEDIR@/deps)

endif()



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

cmake/DetectOptions.cmake

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ if(ADIOS2_USE_Python) 
  if(NOT (ADIOS2_USE_Python STREQUAL AUTO))

    set(python_find_args REQUIRED)

  endif()

  if(SHARED_LIBS_SUPPORTED AND ADIOS2_ENABLE_PIC)

  if(BUILD_SHARED_LIBS)

    set(Python_ADDITIONAL_VERSIONS "3;2.7"

      CACHE STRING "Python versions to search for"

    )

cmake/FindCrayDRC.cmake

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ if(NOT (PC_CrayDRC_FOUND STREQUAL "IGNORE")) 
        set(_PF_TYPE _STATIC)

      endif()

      set(CrayDRC_INCLUDE_DIRS ${PC_CrayDRC${_PC_TYPE}_INCLUDE_DIRS})

      set(CrayDRC_LIBRARIES ${PC_CrayDRC${_PC_TYPE}_LDFLAGS})

      set(CrayDRC_LIBRARIES ${PC_CrayDRC${_PC_TYPE}_LINK_LIBRARIES})

      set(CrayDRC_DEFINITIONS ${PC_CrayDRC${PC_TYPE}_CFLAGS_OTHER})

    endif()

  endif()

cmake/FindLIBFABRIC.cmake

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ if(NOT (PC_LIBFABRIC_FOUND STREQUAL "IGNORE")) 
        set(_PF_TYPE _STATIC)

      endif()

      set(LIBFABRIC_INCLUDE_DIRS ${PC_LIBFABRIC${_PC_TYPE}_INCLUDE_DIRS})

      set(LIBFABRIC_LIBRARIES ${PC_LIBFABRIC${_PC_TYPE}_LDFLAGS})

      set(LIBFABRIC_LIBRARIES ${PC_LIBFABRIC${_PC_TYPE}_LINK_LIBRARIES})

      set(LIBFABRIC_DEFINITIONS ${PC_LIBFABRIC${PC_TYPE}_CFLAGS_OTHER})

    endif()

  endif()