diff -up psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/external/upstream/chemps2/CMakeLists.txt.fedora psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/external/upstream/chemps2/CMakeLists.txt --- psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/external/upstream/chemps2/CMakeLists.txt.fedora 2017-05-16 11:02:04.000000000 -0700 +++ psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/external/upstream/chemps2/CMakeLists.txt 2017-05-16 13:29:07.539864765 -0700 @@ -1,58 +1,5 @@ -if(${ENABLE_CheMPS2}) - find_package(CheMPS2 1.8.3 CONFIG QUIET) - - if(${CheMPS2_FOUND}) - get_property(_loc TARGET CheMPS2::chemps2 PROPERTY LOCATION) - message(STATUS "${Cyan}Found CheMPS2${ColourReset}: ${_loc} (found version ${CheMPS2_VERSION})") - add_library(chemps2_external INTERFACE) # dummy - - # reset below necessary as find_package clears it. better solution sought - set(TargetHDF5_DIR ${STAGED_INSTALL_PREFIX}/share/cmake/TargetHDF5 CACHE PATH "path to externally detected CheMPS2Config.cmake" FORCE) - else() - include(ExternalProject) - message(STATUS "Suitable CheMPS2 could not be located, ${Magenta}Building CheMPS2${ColourReset} instead.") - - if(${BUILD_SHARED_LIBS}) - set(_a_only OFF) - set(_so_only ON) - else() - set(_a_only ON) - set(_so_only OFF) - endif() - - ExternalProject_Add(chemps2_external - DEPENDS lapack_external - hdf5_external - GIT_REPOSITORY https://github.com/SebWouters/CheMPS2 - GIT_TAG 55d6b38 # v1.8.3-12 - UPDATE_COMMAND "" - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} - -DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR} - -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR} - -DSTATIC_ONLY=${_a_only} - -DSHARED_ONLY=${_so_only} - -DENABLE_OPENMP=${ENABLE_OPENMP} # relevant - -DENABLE_XHOST=${ENABLE_XHOST} - -DBUILD_FPIC=${BUILD_FPIC} - -DENABLE_GENERIC=${ENABLE_GENERIC} - -DCMAKE_RANLIB=${CMAKE_RANLIB} - -DCMAKE_AR=${CMAKE_AR} - -DCMAKE_NM=${CMAKE_NM} - -DENABLE_TESTS=OFF - -DTargetLAPACK_DIR=${STAGED_INSTALL_PREFIX}/share/cmake/TargetLAPACK - -DTargetHDF5_DIR=${STAGED_INSTALL_PREFIX}/share/cmake/TargetHDF5 - CMAKE_CACHE_ARGS -DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS} - -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS} - INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} install - DESTDIR=${CMAKE_BINARY_DIR}/stage) - - set(CheMPS2_DIR ${STAGED_INSTALL_PREFIX}/share/cmake/CheMPS2 CACHE PATH "path to internally built CheMPS2Config.cmake" FORCE) - endif() -else() - add_library(chemps2_external INTERFACE) # dummy -endif() - +add_library(chemps2_external INTERFACE) # dummy +add_library(CheMPS2::chemps2 INTERFACE IMPORTED) +set_property(TARGET CheMPS2::chemps2 PROPERTY INTERFACE_LINK_LIBRARIES "-lchemps2") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSING_CheMPS2") +set(CheMPS2_FOUND 1) diff -up psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/external/upstream/libint/CMakeLists.txt.fedora psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/external/upstream/libint/CMakeLists.txt --- psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/external/upstream/libint/CMakeLists.txt.fedora 2017-05-16 11:02:04.000000000 -0700 +++ psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/external/upstream/libint/CMakeLists.txt 2017-05-16 13:29:49.527740960 -0700 @@ -1,35 +1,4 @@ -find_package(Libint 1.2.0 CONFIG QUIET COMPONENTS ${MAX_AM_ERI}) - -if(${Libint_FOUND}) - get_property(_loc TARGET Libint::int PROPERTY LOCATION) - message(STATUS "${Cyan}Found Libint ${Libint_MAX_AM_ERI}${ColourReset}: ${_loc} (found version ${Libint_VERSION})") - add_library(libint_external INTERFACE) # dummy -else() - include(ExternalProject) - message(STATUS "Suitable Libint could not be located, ${Magenta}Building Libint${ColourReset} instead.") - ExternalProject_Add(libint_external - GIT_REPOSITORY https://github.com/evaleev/libint - GIT_TAG 3f14ff0 # v1.2.1 release-1-2-1 - UPDATE_COMMAND "" - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} - -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR} - -DMAX_AM_ERI=${MAX_AM_ERI} - -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} - # OpenMP irrelevant - -DENABLE_XHOST=${ENABLE_XHOST} - -DBUILD_FPIC=${BUILD_FPIC} - -DENABLE_GENERIC=${ENABLE_GENERIC} - -DLIBC_INTERJECT=${LIBC_INTERJECT} - -DMERGE_LIBDERIV_INCLUDEDIR=ON - CMAKE_CACHE_ARGS -DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS} - -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS} - INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} install - DESTDIR=${CMAKE_BINARY_DIR}/stage) - - set(Libint_DIR ${STAGED_INSTALL_PREFIX}/share/cmake/Libint CACHE PATH "path to internally built LibintConfig.cmake" FORCE) -endif() - +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) diff -up psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/external/upstream/pybind11/CMakeLists.txt.fedora psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/external/upstream/pybind11/CMakeLists.txt --- psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/external/upstream/pybind11/CMakeLists.txt.fedora 2017-05-16 11:02:04.000000000 -0700 +++ psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/external/upstream/pybind11/CMakeLists.txt 2017-05-16 13:29:07.539864765 -0700 @@ -1,22 +1,2 @@ -find_package(pybind11 2.0.0 CONFIG QUIET) - -if(${pybind11_FOUND}) - message(STATUS "${Cyan}Found pybind11${ColourReset}: ${pybind11_INCLUDE_DIR} (found version ${pybind11_VERSION})") - add_library(pybind11_external INTERFACE) # dummy -else() - include(ExternalProject) - message(STATUS "Suitable pybind11 could not be located, ${Magenta}Building pybind11${ColourReset} instead.") - ExternalProject_Add(pybind11_external - GIT_REPOSITORY https://github.com/pybind/pybind11 - GIT_TAG v2.0.0 - UPDATE_COMMAND "" - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR} - -DPYBIND11_TEST=OFF - INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} install - DESTDIR=${CMAKE_BINARY_DIR}/stage) - - set(pybind11_DIR ${STAGED_INSTALL_PREFIX}/share/cmake/pybind11 CACHE PATH "path to internally built pybind11Config.cmake" FORCE) -endif() - +add_library(pybind11_external INTERFACE) # dummy +set(pybind11_FOUND 1) diff -up psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/psi4/CMakeLists.txt.fedora psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/psi4/CMakeLists.txt --- psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/psi4/CMakeLists.txt.fedora 2017-05-16 11:02:04.000000000 -0700 +++ psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/psi4/CMakeLists.txt 2017-05-16 13:30:01.582992528 -0700 @@ -64,10 +64,11 @@ else() endif () if(${ENABLE_CheMPS2}) - find_package(CheMPS2 1.8.3 CONFIG REQUIRED) - get_property(_loc TARGET CheMPS2::chemps2 PROPERTY LOCATION) - list(APPEND _addons ${_loc}) - message(STATUS "${Cyan}Using CheMPS2${ColourReset}: ${_loc} (version ${CheMPS2_VERSION})") + add_library(chemps2_external INTERFACE) # dummy + add_library(CheMPS2::chemps2 INTERFACE IMPORTED) + set_property(TARGET CheMPS2::chemps2 PROPERTY INTERFACE_LINK_LIBRARIES "-lchemps2") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSING_CheMPS2") + set(CheMPS2_FOUND 1) else() message(STATUS "Disabled CheMPS2") endif () @@ -108,10 +109,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.1.10 CONFIG REQUIRED) diff -up psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/psi4/src/psi4/libmints/eri.h.fedora psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/psi4/src/psi4/libmints/eri.h --- psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/psi4/src/psi4/libmints/eri.h.fedora 2017-05-16 11:02:04.000000000 -0700 +++ psi4-d2ca81edc24b30d391009dba3bab530db77df2bc/psi4/src/psi4/libmints/eri.h 2017-05-16 13:29:07.539864765 -0700 @@ -30,7 +30,7 @@ #define _psi_src_lib_libmints_eri_h #include -#include +#include #include "psi4/libmints/twobody.h" namespace psi {