Skip to content

Commit c475041

Browse files
committed
Use MKL_FOUND for oneMKL consumers
1 parent f263a44 commit c475041

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ elseif(NOT USE_SW)
564564
endif()
565565
endif()
566566

567-
if(NOT USE_KML AND NOT MKLROOT AND NOT USE_SW)
567+
if(NOT USE_KML AND NOT MKL_FOUND AND NOT USE_SW)
568568
find_package(FFTW3 REQUIRED)
569569
endif()
570570

cmake/CollectBuildInfoVars.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,9 @@ else()
190190
set(ABACUS_LIBXC_VERSION "no")
191191
endif()
192192

193-
if(NOT USE_SW AND NOT MKLROOT AND FFTW3_VERSION)
193+
if(NOT USE_SW AND NOT MKL_FOUND AND FFTW3_VERSION)
194194
set(ABACUS_FFTW_VERSION "yes (v${FFTW3_VERSION})")
195-
elseif(NOT USE_SW AND NOT MKLROOT)
195+
elseif(NOT USE_SW AND NOT MKL_FOUND)
196196
if(FFTW3_INCLUDE_DIR AND EXISTS "${FFTW3_INCLUDE_DIR}/fftw3.h")
197197
file(STRINGS "${FFTW3_INCLUDE_DIR}/fftw3.h" _fftw_ver_line REGEX "^#define[\t ]+FFTW_VERSION[\t ]+\"[^\"]+\"")
198198
if(_fftw_ver_line)

python/pyabacus/src/ModuleNAO/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ add_library(naopack SHARED
2626
)
2727

2828
# link math_libs
29-
if(MKLROOT)
29+
if(MKL_FOUND)
3030
target_link_libraries(naopack
3131
MPI::MPI_CXX
3232
OpenMP::OpenMP_CXX
@@ -52,4 +52,4 @@ target_compile_definitions(_nao_pack PRIVATE VERSION_INFO=${PROJECT_VERSION})
5252
set_target_properties(naopack PROPERTIES INSTALL_RPATH "$ORIGIN")
5353
set_target_properties(_nao_pack PROPERTIES INSTALL_RPATH "$ORIGIN")
5454

55-
install(TARGETS _nao_pack naopack DESTINATION ${TARGET_PACK}/ModuleNAO)
55+
install(TARGETS _nao_pack naopack DESTINATION ${TARGET_PACK}/ModuleNAO)

0 commit comments

Comments
 (0)