Skip to content

Commit 164748c

Browse files
committed
CMake: Decouple ELPA dependency from LCAO
1 parent cd270a7 commit 164748c

1 file changed

Lines changed: 9 additions & 11 deletions

File tree

CMakeLists.txt

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ option(ENABLE_RAPIDJSON "Enable rapid-json usage" OFF)
6565
option(ENABLE_CNPY "Enable cnpy usage" OFF)
6666

6767
# Options requiring MPI and LCAO
68-
cmake_dependent_option(ENABLE_ELPA "Enable ELPA for LCAO" ON "ENABLE_LCAO;ENABLE_MPI" OFF)
68+
cmake_dependent_option(ENABLE_ELPA "Enable ELPA eigensolver" ON "ENABLE_MPI" OFF)
6969
cmake_dependent_option(ENABLE_LIBRI "Enable LibRI for hybrid functional"
7070
OFF "ENABLE_LCAO;ENABLE_MPI" OFF)
7171
cmake_dependent_option(ENABLE_PEXSI "Enable PEXSI for LCAO" OFF "ENABLE_LCAO;ENABLE_MPI" OFF)
@@ -304,17 +304,15 @@ if(CMAKE_CXX_COMPILER_ID MATCHES Intel)
304304
set(ENABLE_ABACUS_LIBM OFF)
305305
endif()
306306

307-
if(ENABLE_LCAO)
308-
if(ENABLE_ELPA)
309-
find_package(ELPA REQUIRED)
310-
endif()
311-
if(ENABLE_PEXSI)
312-
find_package(PEXSI REQUIRED CONFIG)
313-
if(PEXSI_VERSION VERSION_LESS "2.0.0")
314-
message(FATAL_ERROR "PEXSI >= 2.0.0 is required")
315-
endif()
316-
set(CMAKE_CXX_STANDARD 14)
307+
if(ENABLE_ELPA)
308+
find_package(ELPA REQUIRED)
309+
endif()
310+
if(ENABLE_PEXSI)
311+
find_package(PEXSI REQUIRED CONFIG)
312+
if(PEXSI_VERSION VERSION_LESS "2.0.0")
313+
message(FATAL_ERROR "PEXSI >= 2.0.0 is required")
317314
endif()
315+
set(CMAKE_CXX_STANDARD 14)
318316
endif()
319317

320318
if(ENABLE_MPI)

0 commit comments

Comments
 (0)