Commit 37646020 authored by coulaud's avatar coulaud

Fix some problems on MacOs X and Intel compiler

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/scalfmm/scalfmm/trunk@443 2616d619-271b-44dc-8df4-d4a8f33a7222
parent f4f6171b
......@@ -38,8 +38,8 @@ MESSAGE( STATUS "SCALFMM_BUILD_DEBUG = ${SCALFMM_BUILD_DEBUG}" )
if( SCALFMM_BUILD_DEBUG )
SET(CMAKE_BUILD_TYPE Debug)
ADD_DEFINITIONS(-O0)
else()
ADD_DEFINITIONS(-O2)
#else()
# ADD_DEFINITIONS(-O2)
endif()
# Trace
......@@ -55,7 +55,7 @@ endif()
if( SCALFMM_USE_CBLAS )
OPTION( SCALFMM_USE_MKL_AS_BLAS "Set to ON to use MKL CBLAS" OFF )
if( SCALFMM_USE_MKL_AS_BLAS )
SET(CBLAS_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()
#FIND_PACKAGE(BLAS)
#FIND_PACKAGE(Lapack)
......
......@@ -13,11 +13,14 @@
#include "FGlobal.hpp"
#ifdef SCALFMM_USE_MKL_AS_CBLAS
#ifdef SCALFMM_USE_CBLAS
#ifdef SCALFMM_USE_MKL_AS_BLAS
#include <mkl_cblas.h>
#else
#error (I USE MKL)
#include <cblas.h>
#endif
#endif
namespace FCBlas {
///////////////////////////////////////////////////////
......
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