diff --git a/CMakeLists.txt b/CMakeLists.txt index a86cba2199b097777f8193c794d60045e5968e7e..b2259427224bfc9fb63679f2fea32e79521ff431 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,7 +151,7 @@ if(ENABLE_BLAS_LAPACK) else(CMAKE_SIZEOF_VOID_P EQUAL 8) set(MKL_PATH ia32/lib) endif(CMAKE_SIZEOF_VOID_P EQUAL 8) - set(MKL_LIBS_REQUIRED libguide mkl_c mkl_intel_c mkl_intel_thread mkl_core) + set(MKL_LIBS_REQUIRED libguide40 mkl_intel_c mkl_intel_thread mkl_core) find_all_libraries(LAPACK_LIBRARIES MKL_LIBS_REQUIRED ${MKL_PATH}) if(LAPACK_LIBRARIES) set(HAVE_BLAS TRUE) diff --git a/Plugin/Triangulate.cpp b/Plugin/Triangulate.cpp index fed690d02b4ecddf8baaac0748c46fb7534f7395..066e6a596eb5872afb4f17ad0d91d6c9b22bcdcb 100644 --- a/Plugin/Triangulate.cpp +++ b/Plugin/Triangulate.cpp @@ -4,6 +4,7 @@ // bugs and problems to <gmsh@geuz.org>. #include <vector> +#include <stdlib.h> #include "GModel.h" #include "discreteFace.h" #include "DivideAndConquer.h" diff --git a/Post/PViewDataRemote.h b/Post/PViewDataRemote.h index 7adade2db69e67a7c9663c0acf0d14fac9beb990..5518ac48f7086cc84d253487b4f88a52e14963d0 100644 --- a/Post/PViewDataRemote.h +++ b/Post/PViewDataRemote.h @@ -27,7 +27,7 @@ class PViewDataRemote : public PViewData { _time.push_back(time); } ~PViewDataRemote(){} - bool finalize(){} + bool finalize(){ return false;} int getNumTimeSteps(){ return _numTimeSteps; } double getMin(int step=-1){ return _min; } double getMax(int step=-1){ return _max; }