follow-up to failed ExternalProject elimination

CMakeLists.txt

@@ -308,6 +308,9 @@ endif()
 include(FindOrFetchMADWorld)
 detect_MADNESS_configuration()
 include(external/eigen.cmake)
+# the FetchContent-based version will not work due to BLT target name conflicts
+# include(FindOrFetchUmpire)
+# use the ExternalProject-based version
 include(external/umpire.cmake)
 
 ###### discover linear algebra
@@ -344,7 +347,7 @@ endif(ENABLE_WFN91_LINALG_DISCOVERY_KIT)
 include(FindOrFetchBTAS)
 include(FindOrFetchBoost)
 if(ENABLE_SCALAPACK)
-  include(external/scalapack.cmake)
+  include(FindOrFetchScaLAPACK)
 endif()
 if (TA_ENABLE_RANGEV3)
   include(FindOrFetchRangeV3)

cmake/modules/FindOrFetchBoost.cmake

@@ -29,7 +29,7 @@ if (NOT TARGET Boost::boost)
 
   # current boost-cmake/master does not install boost correctly, so warn that installed TiledArray will not be usable
   # boost-cmake/install_rules https://github.com/Orphis/boost-cmake/pull/45 is supposed to fix it but is inactive
-  message(WARNING "Building Boost from source makes TiledArray unusable from the install location! Install TA using package manager or manually and reconfigure/reinstall TiledArray to fix this")
+  message(WARNING "Building Boost from source makes TiledArray unusable from the install location! Install Boost using package manager or manually and reconfigure/reinstall TiledArray to fix this")
   export(EXPORT tiledarray
       FILE "${PROJECT_BINARY_DIR}/boost-targets.cmake")
   install(EXPORT tiledarray

cmake/modules/FindOrFetchMADWorld.cmake

@@ -51,6 +51,9 @@ if (NOT TARGET MADworld)
   # force 'all' target to build madness and MADworld using this dummy target
   add_custom_target(tiledarray-force-all-to-build-madness-target ALL DEPENDS madness MADworld)
 
+  # set MADNESS_CONFIG to the install location so that we know where to find it
+  set(MADNESS_CONFIG ${CMAKE_INSTALL_PREFIX}/${MADNESS_INSTALL_CMAKEDIR}/madness-config.cmake)
+
 endif(NOT TARGET MADworld)
 
 # postcond check

cmake/modules/FindOrFetchUmpire.cmake

@@ -0,0 +1,36 @@
+# try find_package
+if (NOT TARGET umpire)
+  include (FindPackageRegimport)
+  find_package_regimport(umpire QUIET CONFIG)
+  if (TARGET umpire)
+    message(STATUS "Found umpire CONFIG at ${umpire_CONFIG}")
+  endif (TARGET umpire)
+endif (NOT TARGET umpire)
+
+# if not found, build via FetchContent
+if (NOT TARGET umpire)
+
+  include(FetchContent)
+  FetchContent_Declare(
+      umpire
+      GIT_REPOSITORY      https://github.com/LLNL/Umpire.git
+      GIT_TAG             ${TA_TRACKED_UMPIRE_TAG}
+  )
+  FetchContent_MakeAvailable(umpire)
+  FetchContent_GetProperties(umpire
+      SOURCE_DIR UMPIRE_SOURCE_DIR
+      BINARY_DIR UMPIRE_BINARY_DIR
+      )
+
+  # set BTAS_CONFIG to the install location so that we know where to find it
+  set(umpire_CONFIG ${CMAKE_INSTALL_PREFIX}/${UMPIRE_CMAKE_DIR}/umpire-config.cmake)
+
+  # install umpire
+  install(TARGETS umpire umpire_alloc EXPORT tiledarray COMPONENT tiledarray )
+
+endif(NOT TARGET umpire)
+
+# postcond check
+if (NOT TARGET umpire)
+  message(FATAL_ERROR "FindOrFetchUmpire could not make umpire target available")
+endif(NOT TARGET umpire)

examples/scalapack/CMakeLists.txt

@@ -30,8 +30,7 @@ foreach(_exec conversion evp)
 
   # Add executable
   add_executable(scalapack-${_exec} EXCLUDE_FROM_ALL ${_exec}.cpp)
-  target_link_libraries(scalapack-${_exec} PRIVATE tiledarray ${MADNESS_DISABLEPIE_LINKER_FLAG})
-  add_dependencies(scalapack-${_exec} External-tiledarray)
+  target_link_libraries(scalapack-${_exec} PRIVATE tiledarray)
   add_dependencies(examples-tiledarray scalapack-${_exec})
 
 endforeach()

src/CMakeLists.txt

@@ -220,6 +220,7 @@ TiledArray/math/linalg/rank-local.cpp
 )
 
 # the list of libraries on which TiledArray depends on, will be cached later
+# when FetchContent umpire: set(_TILEDARRAY_DEPENDENCIES MADworld TiledArray_Eigen BTAS::BTAS blaspp_headers umpire)
 set(_TILEDARRAY_DEPENDENCIES MADworld TiledArray_Eigen BTAS::BTAS blaspp_headers TiledArray_UMPIRE)
 
 # TODO better ways to handle tiledarray cuda dependency