Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions external/umpire.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,21 @@ if(_UMPIRE_INSTALL_DIR)
# find_package(umpire REQUIRED)
message(STATUS "Umpire found at ${_UMPIRE_INSTALL_DIR}")

add_library(TiledArray_UMPIRE INTERFACE)

set_target_properties(
TiledArray_UMPIRE
PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES
"${_UMPIRE_INSTALL_DIR}/include"
INTERFACE_LINK_LIBRARIES
"umpire"
INTERFACE_LINK_DIRECTORIES
"${_UMPIRE_INSTALL_DIR}/lib/"
)

install(TARGETS TiledArray_UMPIRE EXPORT tiledarray COMPONENT tiledarray)

elseif(TA_EXPERT)

message("** Umpire was not found")
Expand Down Expand Up @@ -190,23 +205,22 @@ else()

set(_UMPIRE_INSTALL_DIR ${EXTERNAL_INSTALL_DIR})

endif(_UMPIRE_INSTALL_DIR)

# manually add Umpire library

add_library(TiledArray_UMPIRE INTERFACE)
add_library(TiledArray_UMPIRE INTERFACE)

set_target_properties(
TiledArray_UMPIRE
PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES
"$<BUILD_INTERFACE:${EXTERNAL_SOURCE_DIR}/src>;$<BUILD_INTERFACE:${EXTERNAL_SOURCE_DIR}/src/tpl>;$<BUILD_INTERFACE:${EXTERNAL_SOURCE_DIR}/src/tpl/umpire/camp/include>;$<BUILD_INTERFACE:${EXTERNAL_BUILD_DIR}/src/tpl/umpire/camp/include>;$<BUILD_INTERFACE:${EXTERNAL_BUILD_DIR}/include>;$<INSTALL_INTERFACE:${_UMPIRE_INSTALL_DIR}/include>"
INTERFACE_LINK_LIBRARIES
"$<BUILD_INTERFACE:${UMPIRE_BUILD_BYPRODUCTS}>;$<INSTALL_INTERFACE:${_UMPIRE_INSTALL_DIR}/lib/libumpire${UMPIRE_DEFAULT_LIBRARY_SUFFIX}>"
)
set_target_properties(
TiledArray_UMPIRE
PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES
"$<BUILD_INTERFACE:${EXTERNAL_SOURCE_DIR}/src>;$<BUILD_INTERFACE:${EXTERNAL_SOURCE_DIR}/src/tpl>;$<BUILD_INTERFACE:${EXTERNAL_SOURCE_DIR}/src/tpl/umpire/camp/include>;$<BUILD_INTERFACE:${EXTERNAL_BUILD_DIR}/src/tpl/umpire/camp/include>;$<BUILD_INTERFACE:${EXTERNAL_BUILD_DIR}/include>;$<INSTALL_INTERFACE:${_UMPIRE_INSTALL_DIR}/include>"
INTERFACE_LINK_LIBRARIES
"$<BUILD_INTERFACE:${UMPIRE_BUILD_BYPRODUCTS}>;$<INSTALL_INTERFACE:${_UMPIRE_INSTALL_DIR}/lib/libumpire${UMPIRE_DEFAULT_LIBRARY_SUFFIX}>"
)

install(TARGETS TiledArray_UMPIRE EXPORT tiledarray COMPONENT tiledarray)

endif(_UMPIRE_INSTALL_DIR)

#TODO test Umpire

endif(NOT TARGET TiledArray_UMPIRE)