diff -up psi4-1.3.2/CMakeLists.txt.fedora psi4-1.3.2/CMakeLists.txt
--- psi4-1.3.2/CMakeLists.txt.fedora 2019-05-15 18:05:49.000000000 +0300
+++ psi4-1.3.2/CMakeLists.txt 2019-07-27 12:25:14.815858310 +0300
@@ -185,17 +185,14 @@ ExternalProject_Add(psi4-core
ambit_external
chemps2_external
dkh_external
- libefp_external
erd_external
gau2grid_external
gdma_external
- libint_external
pcmsolver_external
pybind11_external
pylibefp_external
qcelemental_external
simint_external
- libxc_external
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/psi4
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${STAGED_INSTALL_PREFIX}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
diff -up psi4-1.3.2/external/upstream/CMakeLists.txt.fedora psi4-1.3.2/external/upstream/CMakeLists.txt
--- psi4-1.3.2/external/upstream/CMakeLists.txt.fedora 2019-05-15 18:05:49.000000000 +0300
+++ psi4-1.3.2/external/upstream/CMakeLists.txt 2019-07-27 12:25:14.815858310 +0300
@@ -2,16 +2,13 @@ foreach(dir pybind11
ambit
chemps2
dkh
- libefp
erd
gau2grid
gdma
- libint
pcmsolver
pylibefp
qcelemental
simint
- libxc
)
add_subdirectory(${dir})
endforeach()
diff -up psi4-1.3.2/external/upstream/pybind11/CMakeLists.txt.fedora psi4-1.3.2/external/upstream/pybind11/CMakeLists.txt
--- psi4-1.3.2/external/upstream/pybind11/CMakeLists.txt.fedora 2019-05-15 18:05:49.000000000 +0300
+++ psi4-1.3.2/external/upstream/pybind11/CMakeLists.txt 2019-07-27 12:25:14.815858310 +0300
@@ -1,4 +1,4 @@
-find_package(pybind11 2.2.3 CONFIG QUIET)
+find_package(pybind11 2.2.2 CONFIG QUIET)
if(${pybind11_FOUND})
message(STATUS "${Cyan}Found pybind11${ColourReset}: ${pybind11_INCLUDE_DIR} (found version ${pybind11_VERSION})")
diff -up psi4-1.3.2/psi4/CMakeLists.txt.fedora psi4-1.3.2/psi4/CMakeLists.txt
--- psi4-1.3.2/psi4/CMakeLists.txt.fedora 2019-05-15 18:05:49.000000000 +0300
+++ psi4-1.3.2/psi4/CMakeLists.txt 2019-07-27 12:25:14.815858310 +0300
@@ -57,7 +57,7 @@ if(MSVC)
else()
set(PYBIND11_CPP_STANDARD "-std=c++${CMAKE_CXX_STANDARD}")
endif()
-find_package(pybind11 2.2.3 CONFIG REQUIRED)
+find_package(pybind11 2.2.2 CONFIG REQUIRED)
message(STATUS "${Cyan}Using pybind11${ColourReset}: ${pybind11_INCLUDE_DIR} (version ${pybind11_VERSION} for Py${PYTHON_VERSION_STRING} and ${PYBIND11_CPP_STANDARD})")
message(STATUS "${Cyan}Using Python ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}${ColourReset}: ${PYTHON_EXECUTABLE}")
@@ -71,14 +71,11 @@ else()
message(STATUS "Disabled ambit")
endif ()
-if(${ENABLE_CheMPS2})
- find_package(CheMPS2 1.8.7 CONFIG REQUIRED)
- get_property(_loc TARGET CheMPS2::chemps2 PROPERTY LOCATION)
- list(APPEND _addons ${_loc})
- message(STATUS "${Cyan}Using CheMPS2${ColourReset}: ${_loc} (version ${CheMPS2_VERSION})")
-else()
- message(STATUS "Disabled CheMPS2")
-endif ()
+add_library(chemps2_external INTERFACE) # dummy
+add_library(CheMPS2::chemps2 INTERFACE IMPORTED)
+set_property(TARGET CheMPS2::chemps2 PROPERTY INTERFACE_LINK_LIBRARIES "-lchemps2")
+add_definitions(-DUSING_CheMPS2)
+set(chemps2_FOUND 1)
if(${ENABLE_dkh})
find_package(dkh 1.2 CONFIG REQUIRED)
@@ -129,10 +126,10 @@ else()
message(STATUS "Disabled gdma")
endif()
-find_package(Libint 1.2.0 CONFIG REQUIRED COMPONENTS ${MAX_AM_ERI})
-get_property(_loc TARGET Libint::int PROPERTY LOCATION)
-list(APPEND _addons ${_loc})
-message(STATUS "${Cyan}Using Libint ${Libint_MAX_AM_ERI}${ColourReset}: ${_loc} (version ${Libint_VERSION})")
+add_library(libint_external INTERFACE) # dummy
+add_library(Libint::libint INTERFACE IMPORTED)
+set_property(TARGET Libint::libint PROPERTY INTERFACE_LINK_LIBRARIES "-lderiv -lint")
+set(libint_FOUND 1)
if(${ENABLE_PCMSolver})
find_package(PCMSolver 1.2.1 CONFIG REQUIRED)
@@ -152,10 +149,10 @@ else()
message(STATUS "Disabled simint")
endif()
-find_package(Libxc 4.3.0 CONFIG REQUIRED)
-get_property(_loc TARGET Libxc::xc PROPERTY LOCATION)
-list(APPEND _addons ${_loc})
-message(STATUS "${Cyan}Using Libxc${ColourReset}: ${_loc} (version ${Libxc_VERSION})")
+add_library(Libxc_external INTERFACE) # dummy
+add_library(Libxc::xc INTERFACE IMPORTED)
+set_property(TARGET Libxc::xc PROPERTY INTERFACE_LINK_LIBRARIES "-lxc")
+set(Libxc_FOUND 1)
if(APPLE)
set(PRE_LIBRARY_OPTION -Wl,-all_load)