Mentions légales du service

Skip to content
Snippets Groups Projects

Remove distinction between BLAS_SEQ and BLAS_PAR

Merged ESTERIE Pierre requested to merge blas_fftw into master
1 file
+ 12
12
Compare changes
  • Side-by-side
  • Inline
+ 12
12
@@ -479,8 +479,8 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR
@@ -479,8 +479,8 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR
# FFTW relies on blas libs
# FFTW relies on blas libs
if (FFTW_LOOK_FOR_THREADS)
if (FFTW_LOOK_FOR_THREADS)
if (FFTW_LOOK_FOR_MKL)
if (FFTW_LOOK_FOR_MKL)
if (BLAS_LIBRARIES_PAR)
if (BLAS_LIBRARIES)
list(APPEND FFTW_LIBRARIES "${BLAS_LIBRARIES_PAR}")
list(APPEND FFTW_LIBRARIES "${BLAS_LIBRARIES}")
if (NOT FFTW_FIND_QUIETLY)
if (NOT FFTW_FIND_QUIETLY)
message(STATUS "Multithreaded FFTW has been found: ${FFTW_LIBRARIES}")
message(STATUS "Multithreaded FFTW has been found: ${FFTW_LIBRARIES}")
endif()
endif()
@@ -492,10 +492,10 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR
@@ -492,10 +492,10 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR
message(STATUS "Multithreaded FFTW not found.")
message(STATUS "Multithreaded FFTW not found.")
endif()
endif()
endif()
endif()
endif(BLAS_LIBRARIES_PAR)
endif(BLAS_LIBRARIES)
elseif (FFTW_LOOK_FOR_ESSL)
elseif (FFTW_LOOK_FOR_ESSL)
if (FFTW_LIBRARIES AND BLAS_LIBRARIES_PAR)
if (FFTW_LIBRARIES AND BLAS_LIBRARIES)
list(APPEND FFTW_LIBRARIES "${BLAS_LIBRARIES_PAR}")
list(APPEND FFTW_LIBRARIES "${BLAS_LIBRARIES}")
if (NOT FFTW_FIND_QUIETLY)
if (NOT FFTW_FIND_QUIETLY)
message(STATUS "Multithreaded FFTW has been found: ${FFTW_LIBRARIES}")
message(STATUS "Multithreaded FFTW has been found: ${FFTW_LIBRARIES}")
endif()
endif()
@@ -507,12 +507,12 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR
@@ -507,12 +507,12 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR
message(STATUS "Multithreaded FFTW not found.")
message(STATUS "Multithreaded FFTW not found.")
endif()
endif()
endif()
endif()
endif(FFTW_LIBRARIES AND BLAS_LIBRARIES_PAR)
endif(FFTW_LIBRARIES AND BLAS_LIBRARIES)
endif()
endif()
else(FFTW_LOOK_FOR_THREADS)
else(FFTW_LOOK_FOR_THREADS)
if (FFTW_LOOK_FOR_MKL)
if (FFTW_LOOK_FOR_MKL)
if (BLAS_LIBRARIES_SEQ)
if (BLAS_LIBRARIES)
list(APPEND FFTW_LIBRARIES "${BLAS_LIBRARIES_SEQ}")
list(APPEND FFTW_LIBRARIES "${BLAS_LIBRARIES}")
if (NOT FFTW_FIND_QUIETLY)
if (NOT FFTW_FIND_QUIETLY)
message(STATUS "FFTW has been found: ${FFTW_LIBRARIES}")
message(STATUS "FFTW has been found: ${FFTW_LIBRARIES}")
endif()
endif()
@@ -524,10 +524,10 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR
@@ -524,10 +524,10 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR
message(STATUS "FFTW not found.")
message(STATUS "FFTW not found.")
endif()
endif()
endif()
endif()
endif(BLAS_LIBRARIES_SEQ)
endif(BLAS_LIBRARIES)
elseif (FFTW_LOOK_FOR_ESSL)
elseif (FFTW_LOOK_FOR_ESSL)
if (FFTW_LIBRARIES AND BLAS_LIBRARIES_SEQ)
if (FFTW_LIBRARIES AND BLAS_LIBRARIES)
list(APPEND FFTW_LIBRARIES "${BLAS_LIBRARIES_SEQ}")
list(APPEND FFTW_LIBRARIES "${BLAS_LIBRARIES}")
if (NOT FFTW_FIND_QUIETLY)
if (NOT FFTW_FIND_QUIETLY)
message(STATUS "FFTW has been found: ${FFTW_LIBRARIES}")
message(STATUS "FFTW has been found: ${FFTW_LIBRARIES}")
endif()
endif()
@@ -539,7 +539,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR
@@ -539,7 +539,7 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR
message(STATUS "FFTW not found.")
message(STATUS "FFTW not found.")
endif()
endif()
endif()
endif()
endif(FFTW_LIBRARIES AND BLAS_LIBRARIES_SEQ)
endif(FFTW_LIBRARIES AND BLAS_LIBRARIES)
endif()
endif()
endif(FFTW_LOOK_FOR_THREADS)
endif(FFTW_LOOK_FOR_THREADS)
Loading