Skip to content

Build: fix compatibility issue against toolchain install #3540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caic99 merged 20 commits into from
Jan 25, 2024
Merged

Build: fix compatibility issue against toolchain install #3540

Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e6ebf07
Fix for finding LibXC and ELPA
yizeyi18 Jan 12, 2024
b43112b
For compatibility to previous routines
yizeyi18 Jan 12, 2024
e8d46c4
syntax fix for FindELPA.cmake
yizeyi18 Jan 12, 2024
283b67f
Update cmake/FindELPA.cmake
yizeyi18 Jan 15, 2024
f9e3642
Using CMake interface as default for finding LibXC
yizeyi18 Jan 15, 2024
50f8766
Merge branch 'develop' of https://github.com/yizeyi18/abacus-develop …
yizeyi18 Jan 15, 2024
660d390
update docs
yizeyi18 Jan 15, 2024
7bd18db
fix for FindLibxc: changing imcompatible if statement
yizeyi18 Jan 15, 2024
ab0ab5a
fix for FindLibxc: changing imcompatible if statement
yizeyi18 Jan 15, 2024
f887d41
fix for FindLibxc: changing imcompatible if statement
yizeyi18 Jan 15, 2024
7cdd7b4
update docs for installing pkg-config
yizeyi18 Jan 16, 2024
3ce7ac6
Update FindLibxc.cmake
caic99 Jan 17, 2024
e843819
Update FindLibxc.cmake
caic99 Jan 17, 2024
821977d
remove previous LibXC routine in CMakeLists.txt
yizeyi18 Jan 17, 2024
a9cbf70
Update easy_install.md with Makefile-built LibXC supported
yizeyi18 Jan 17, 2024
3eb0e2f
Update easy_install.md to include different behavior in different ver…
yizeyi18 Jan 17, 2024
f2619f1
Merge branch 'deepmodeling:develop' into develop
yizeyi18 Jan 22, 2024
2a61308
fix compatibility issue against toolchain
yizeyi18 Jan 22, 2024
8a5d852
Change default ELPA install routine to old one
yizeyi18 Jan 22, 2024
344fb6c
Merge branch 'develop' into develop
yizeyi18 Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 24 additions & 23 deletions cmake/FindELPA.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,26 @@

find_package(PkgConfig)

if(PKG_CONFIG_FOUND)
find_path(ELPA_INCLUDE_DIRS
elpa/elpa.h
HINTS ${ELPA_DIR}
PATH_SUFFIXES "include" "include/elpa"
)
if(USE_OPENMP)
find_library(ELPA_LINK_LIBRARIES
NAMES elpa_openmp elpa
HINTS ${ELPA_DIR}
PATH_SUFFIXES "lib"
)
else()
find_library(ELPA_LINK_LIBRARIES
NAMES elpa
HINTS ${ELPA_DIR}
PATH_SUFFIXES "lib"
)
endif()

if(NOT ELPA_INCLUDE_DIRS AND PKG_CONFIG_FOUND)
if(DEFINED ELPA_DIR)
string(APPEND CMAKE_PREFIX_PATH ";${ELPA_DIR}")
endif()
Expand All @@ -18,27 +37,9 @@ if(PKG_CONFIG_FOUND)
else()
pkg_search_module(ELPA REQUIRED IMPORTED_TARGET GLOBAL elpa)
endif()
else()
find_path(ELPA_INCLUDE_DIRS
elpa/elpa.h
HINTS ${ELPA_DIR}
PATH_SUFFIXES "include" "include/elpa"
)
if(USE_OPENMP)
find_library(ELPA_LINK_LIBRARIES
NAMES elpa_openmp elpa
HINTS ${ELPA_DIR}
PATH_SUFFIXES "lib"
)
else()
find_library(ELPA_LINK_LIBRARIES
NAMES elpa
HINTS ${ELPA_DIR}
PATH_SUFFIXES "lib"
)
endif()
#message(
# "ELPA : We need pkg-config to get all information about the elpa library")
elseif(NOT PKG_CONFIG_FOUND)
message(
"ELPA : We need pkg-config to get all information about the elpa library")
endif()

# Handle the QUIET and REQUIRED arguments and
Expand All @@ -48,7 +49,7 @@ find_package_handle_standard_args(ELPA DEFAULT_MSG ELPA_LINK_LIBRARIES ELPA_INCL

# Copy the results to the output variables and target.
if(ELPA_FOUND)
set(ELPA_LIBRARY ${ELPA_LINK_LIBRARIES})
list(GET ELPA_LINK_LIBRARIES 0 ELPA_LIBRARY)
set(ELPA_INCLUDE_DIR ${ELPA_INCLUDE_DIRS})

if(NOT TARGET ELPA::ELPA)
Expand Down