Commit a69a4c54 authored by berenger-bramas's avatar berenger-bramas

Make things compile on my computer (and on intel plafrim compiler with MKL)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/scalfmm/scalfmm/trunk@446 2616d619-271b-44dc-8df4-d4a8f33a7222
parent 655fc192
...@@ -38,8 +38,8 @@ MESSAGE( STATUS "SCALFMM_BUILD_DEBUG = ${SCALFMM_BUILD_DEBUG}" ) ...@@ -38,8 +38,8 @@ MESSAGE( STATUS "SCALFMM_BUILD_DEBUG = ${SCALFMM_BUILD_DEBUG}" )
if( SCALFMM_BUILD_DEBUG ) if( SCALFMM_BUILD_DEBUG )
SET(CMAKE_BUILD_TYPE Debug) SET(CMAKE_BUILD_TYPE Debug)
ADD_DEFINITIONS(-O0) ADD_DEFINITIONS(-O0)
#else() else()
# ADD_DEFINITIONS(-O2) ADD_DEFINITIONS(-O2)
endif() endif()
# Trace # Trace
...@@ -57,11 +57,8 @@ if( SCALFMM_USE_CBLAS ) ...@@ -57,11 +57,8 @@ if( SCALFMM_USE_CBLAS )
if( SCALFMM_USE_MKL_AS_BLAS ) if( SCALFMM_USE_MKL_AS_BLAS )
SET(BLAS_LIBRARIES "-L$ENV{MKLROOT}/lib -lmkl_intel_lp64 -lmkl_sequential -lmkl_core") SET(BLAS_LIBRARIES "-L$ENV{MKLROOT}/lib -lmkl_intel_lp64 -lmkl_sequential -lmkl_core")
else() else()
#FIND_PACKAGE(BLAS)
#FIND_PACKAGE(Lapack)
INCLUDE(FindBLAS) INCLUDE(FindBLAS)
INCLUDE(FindLAPACK) INCLUDE(FindLAPACK)
#SET(CBLAS_LIBRARIES "-lcblas")
endif() endif()
endif() endif()
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#ifdef SCALFMM_USE_MKL_AS_BLAS #ifdef SCALFMM_USE_MKL_AS_BLAS
#include <mkl_cblas.h> #include <mkl_cblas.h>
#else #else
#error (I USE MKL)
#include <cblas.h> #include <cblas.h>
#endif #endif
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment