Skip to content

Commit 7e4e4ff

Browse files
authored
Fix compilation error on Sunway (#6683)
1 parent 41ddd13 commit 7e4e4ff

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

CMakeLists.txt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,6 @@ if (USE_SW)
286286
include_directories(${SW_FFT}/include)
287287

288288
target_link_libraries(${ABACUS_BIN_NAME} ${SW_FFT}/lib/libfftw3.a)
289-
target_link_libraries(${ABACUS_BIN_NAME} ${SW_MATH}/libswfft.a)
290-
target_link_libraries(${ABACUS_BIN_NAME} ${SW_MATH}/libswscalapack.a)
291-
target_link_libraries(${ABACUS_BIN_NAME} ${SW_MATH}/libswlapack.a)
292-
target_link_libraries(${ABACUS_BIN_NAME} ${SW_MATH}/libswblas.a)
293289
endif()
294290

295291
find_package(Threads REQUIRED)
@@ -470,10 +466,7 @@ if(MKLROOT)
470466
if(CMAKE_CXX_COMPILER_ID MATCHES Intel)
471467
list(APPEND math_libs ifcore)
472468
endif()
473-
elseif(USE_SW)
474-
list(APPEND math_libs gfortran)
475-
# SW architecture can only use its own math library
476-
else()
469+
elseif(NOT USE_SW)
477470
find_package(FFTW3 REQUIRED)
478471
find_package(Lapack REQUIRED)
479472
include_directories(${FFTW3_INCLUDE_DIRS})
@@ -796,6 +789,17 @@ if(ENABLE_RAPIDJSON)
796789
target_link_libraries(${ABACUS_BIN_NAME} json_output)
797790
endif()
798791

792+
if (USE_SW)
793+
target_link_libraries(${ABACUS_BIN_NAME} ${SW_MATH}/libswfft.a)
794+
target_link_libraries(${ABACUS_BIN_NAME} ${SW_MATH}/libswscalapack.a)
795+
target_link_libraries(${ABACUS_BIN_NAME} ${SW_MATH}/libswlapack.a)
796+
target_link_libraries(${ABACUS_BIN_NAME} ${SW_MATH}/libswblas.a)
797+
list(APPEND math_libs gfortran)
798+
endif()
799+
800+
list(APPEND math_libs m)
801+
target_link_libraries(${ABACUS_BIN_NAME} ${math_libs})
802+
799803
install(PROGRAMS ${ABACUS_BIN_PATH}
800804
TYPE BIN
801805
# DESTINATION ${CMAKE_INSTALL_BINDIR}

0 commit comments

Comments
 (0)