Commit bf7e47d1 authored by Sarai Dery Folkestad's avatar Sarai Dery Folkestad
Browse files

Merge branch 'libcint.so' into 'development' 

Make cmake look for libcint.so in addition to libcint.a

See merge request !1564
parents a06beae8 5725cd7e

changelog.md

+2 −1
Original line number Diff line number Diff line
@@ -106,7 +106,8 @@ 
- Renamed omega and gradient threshold to residual threshold and print orbitals to write orbitals. eT-program/eT!1428

- Environment classes now provide a fock matrix collecting all embedding contributions. eT-program/eT!1442

- Separated out reading and parsing of input file in the `input_file` (now reamed `input_tool`). eT-program/eT!1464

- Allowed wave function defined for HF engines. eT-program/eT!!1547

- Allowed wave function defined for HF engines. eT-program/eT!1547

- Make eT search for libcint.so in addition to libcint.a. eT-program/eT!1564



### Bugfixes

- Fixed eT interface to libint-2.7.1 and newer. eT-program/eT!1154

cmake/FindLibcint.cmake

+7 −4
Original line number Diff line number Diff line
@@ -20,7 +20,10 @@ 


# Where to look for Libcint

set(_LIBCINT_NORMAL_SEARCH

   /usr/local/libcint

   /usr/local/lib/

   /usr/lib/

   /lib/

   /lib64/

   /usr/opt/local/libcint)



# Save location if set in environment
@@ -30,7 +33,7 @@ set(LIBCINT_ENV $ENV{LIBCINT_ROOT}) 
if(LIBCINT_ROOT)

   message(STATUS "Libcint will be searched for based on LIBCINT_ROOT=${LIBCINT_ROOT}")

   find_library(Libcint_LIBRARY

                NAMES libcint.a

                NAMES libcint.a libcint.so

                PATHS ${LIBCINT_ROOT} NO_DEFAULT_PATH

                PATH_SUFFIXES lib lib64)
@@ -38,7 +41,7 @@ if(LIBCINT_ROOT) 
elseif(LIBCINT_ENV)

   message(STATUS "Libcint will be searched for based on LIBCINT_ROOT=${LIBCINT_ENV}")

   find_library(Libcint_LIBRARY

                NAMES libcint.a

                NAMES libcint.a libcint.so

                PATHS ${LIBCINT_ENV} NO_DEFAULT_PATH

                PATH_SUFFIXES lib lib64)
@@ -47,7 +50,7 @@ else() 
   message(STATUS "Libcint will be searched for based on default path ${_LIBCINT_NORMAL_SEARCH}")

   foreach(search ${_LIBCINT_NORMAL_SEARCH})

      find_library(Libcint_LIBRARY

                  NAMES libcint.a

                  NAMES libcint.a libcint.so

                  PATHS ${search} NO_DEFAULT_PATH

                  PATH_SUFFIXES lib lib64)

   endforeach()

cmake/findlibint/FindLibint2.cmake

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ if(LIBINT2_GLOB_DIR) 


   get_filename_component(_BASE_PATH ${Libint2_INCLUDE_DIR} PATH)

   find_library(Libint2_LIBRARY

                NAMES libint2.a

                NAMES libint2.a libint2.so

                PATHS ${_BASE_PATH} NO_DEFAULT_PATH

                PATH_SUFFIXES lib lib/.libs)