From c31e2bb6b12484a4ad8c9c23fe64aee78c29e179 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 8 Jul 2010 07:44:12 +0000
Subject: [PATCH]
---
CMakeLists.txt | 3 ++-
Geo/GModel.cpp | 2 +-
Plugin/NearestNeighbor.cpp | 2 ++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8151df8d5e..50377251b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,7 +79,8 @@ set(GMSH_API
Geo/Homology.h
Mesh/meshGEdge.h Mesh/meshGFace.h Mesh/meshGFaceOptimize.h
Mesh/meshGFaceDelaunayInsertion.h
- Solver/dofManager.h Solver/femTerm.h Solver/laplaceTerm.h Solver/elasticityTerm.h Solver/crossConfTerm.h Solver/orthogonalTerm.h
+ Solver/dofManager.h Solver/femTerm.h Solver/laplaceTerm.h Solver/elasticityTerm.h
+ Solver/crossConfTerm.h Solver/orthogonalTerm.h
Solver/linearSystem.h Solver/linearSystemGMM.h Solver/linearSystemCSR.h
Solver/linearSystemFull.h Solver/elasticitySolver.h
Post/PView.h Post/PViewData.h Plugin/PluginManager.h
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index 45bff1cc86..62e8e8005d 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -1619,7 +1619,7 @@ void GModel::save(std::string fileName)
GModel *temp = GModel::current();
GModel::setCurrent(this);
int guess = GuessFileFormatFromFileName(fileName);
- CreateOutputFile (fileName, guess);
+ CreateOutputFile(fileName, guess);
GModel::setCurrent(temp);
}
diff --git a/Plugin/NearestNeighbor.cpp b/Plugin/NearestNeighbor.cpp
index 78df0fff85..db789e314d 100644
--- a/Plugin/NearestNeighbor.cpp
+++ b/Plugin/NearestNeighbor.cpp
@@ -88,6 +88,8 @@ PView *GMSH_NearestNeighborPlugin::execute(PView *v)
annDeallocPts(zeronodes);
delete [] index;
delete [] dist;
+#else
+ Msg::Error("Nearest neighbor computation requires ANN");
#endif
data1->setName(v1->getData()->getName() + "_NearestNeighbor");
--
GitLab