tjh.dev
1diff --git a/cmake/FindLibxc.cmake b/cmake/FindLibxc.cmake
2index 011a36b77..226f38051 100644
3--- a/cmake/FindLibxc.cmake
4+++ b/cmake/FindLibxc.cmake
5@@ -1,45 +1,50 @@
6-include(FindPackageHandleStandardArgs)
7-find_package(PkgConfig REQUIRED)
8-
9 pkg_search_module(_LIBXC libxc>=${Libxc_FIND_VERSION})
10
11-find_library(LIBXC_LIBRARIES NAMES libxc.a
12+find_library(LIBXC_LIBRARIES NAMES xc
13 PATH_SUFFIXES lib
14 HINTS
15- ${LIBXC_ROOT}
16 ENV EBROOTLIBXC
17 ENV LIBXCROOT
18 ${_LIBXC_LIBRARY_DIRS}
19 DOC "libxc libraries list")
20
21-find_library(LIBXC_LIBRARIES_F03 NAMES libxcf03.a
22+find_library(LIBXC_LIBRARIES_F90 NAMES xcf90
23 PATH_SUFFIXES lib
24 HINTS
25- ${LIBXC_ROOT}
26 ENV EBROOTLIBXC
27 ENV LIBXCROOT
28 ${_LIBXC_LIBRARY_DIRS}
29 DOC "libxc libraries list")
30
31+find_library(LIBXC_LIBRARIES_F03 NAMES xcf03
32+ PATH_SUFFIXES lib
33+ HINTS
34+ ENV EBROOTLIBXC
35+ ENV LIBXCROOT
36+ ${_LIBXC_LIBRARY_DIRS})
37 find_path(LIBXC_INCLUDE_DIR NAMES xc.h
38 PATH_SUFFIXES inc include
39 HINTS
40- ${LIBXC_ROOT}
41 ${_LIBXC_INCLUDE_DIRS}
42 ENV EBROOTLIBXC
43 ENV LIBXCROOT)
44
45+find_path(LIBXC_INCLUDE_DIR_F90 NAMES xc_f90_lib_m.mod
46+ PATH_SUFFIXES inc include
47+ HINTS
48+ ${_LIBXC_INCLUDE_DIRS}
49+ ENV EBROOTLIBXC
50+ ENV LIBXCROOT)
51 find_path(LIBXC_INCLUDE_DIR_F03 NAMES xc_f03_lib_m.mod
52 PATH_SUFFIXES inc include
53 HINTS
54- ${LIBXC_ROOT}
55 ${_LIBXC_INCLUDE_DIRS}
56 ENV EBROOTLIBXC
57 ENV LIBXCROOT)
58
59 find_package_handle_standard_args(Libxc DEFAULT_MSG LIBXC_LIBRARIES LIBXC_INCLUDE_DIR)
60
61-if (${Libxc_FOUND} AND LIBXC_LIBRARIES_F03 AND LIBXC_INCLUDE_DIR_F03)
62+if (${Libxc_FOUND} AND LIBXC_LIBRARIES_F90 AND LIBXC_LIBRARIES_F03 AND LIBXC_INCLUDE_DIR_F90 AND LIBXC_INCLUDE_DIR_F03)
63 if(_LIBXC_VERSION)
64 set(Libxc_VERSION ${_LIBXC_VERSION})
65 else()
66@@ -53,4 +58,3 @@ if (${Libxc_FOUND} AND LIBXC_LIBRARIES_F03 AND LIBXC_INCLUDE_DIR_F03)
67 else()
68 unset(Libxc_FOUND)
69 endif()
70-