From 5c94ec7e210d18ef61c47e0374d25848099e5e28 Mon Sep 17 00:00:00 2001
From: Claudine Bon <claudine.bon@samtech.com>
Date: Fri, 18 Sep 2009 07:50:22 +0000
Subject: [PATCH] Plugin/Triangulate.cpp Post/PView.cpp Post/PViewDataRemote.h
: Change for compilation on SunOS
CMakeLists.txt : Change mkl libraries on windows
---
CMakeLists.txt | 2 +-
Plugin/Triangulate.cpp | 1 +
Post/PViewDataRemote.h | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a86cba2199..b225942722 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 fed690d02b..066e6a596e 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 7adade2db6..5518ac48f7 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; }
--
GitLab