From 45d02a8724513ffd4d330fbcd2d26ac11e7354d3 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 6 Apr 2015 18:06:25 +0000
Subject: [PATCH] enable ANN in mobile app
---
Geo/GFaceCompound.cpp | 2 +-
Geo/GRbf.cpp | 2 +-
Mesh/BackgroundMesh.h | 2 +-
Mesh/BackgroundMesh3D.h | 2 +-
Mesh/CenterlineField.cpp | 3 +--
Mesh/meshGFaceElliptic.cpp | 2 +-
contrib/mobile/utils/onelab_android_build.sh | 2 +-
contrib/mobile/utils/onelab_ios_build.sh | 2 +-
contrib/mobile/utils/onelab_iossimulator_build.sh | 2 +-
9 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/Geo/GFaceCompound.cpp b/Geo/GFaceCompound.cpp
index 04076a4503..f11549ca8d 100644
--- a/Geo/GFaceCompound.cpp
+++ b/Geo/GFaceCompound.cpp
@@ -45,7 +45,7 @@
#include "MPoint.h"
#include "Numeric.h"
#include "meshGFace.h"
-#include <ANN/ANN.h>
+#include "ANN/ANN.h"
static void fixEdgeToValue(GEdge *ed, double value, dofManager<double> &myAssembler)
{
diff --git a/Geo/GRbf.cpp b/Geo/GRbf.cpp
index 4c5189990e..d91468e9c3 100644
--- a/Geo/GRbf.cpp
+++ b/Geo/GRbf.cpp
@@ -24,7 +24,7 @@
#endif
#if defined(HAVE_ANN)
-#include <ANN/ANN.h>
+#include "ANN/ANN.h"
#endif
static void SphereBB(void *a, double*mmin, double*mmax)
diff --git a/Mesh/BackgroundMesh.h b/Mesh/BackgroundMesh.h
index 812ad9c60b..7080c953c3 100644
--- a/Mesh/BackgroundMesh.h
+++ b/Mesh/BackgroundMesh.h
@@ -13,7 +13,7 @@
#include "BackgroundMeshTools.h"
#if defined(HAVE_ANN)
-#include <ANN/ANN.h>
+#include "ANN/ANN.h"
class ANNkd_tree;
#endif
diff --git a/Mesh/BackgroundMesh3D.h b/Mesh/BackgroundMesh3D.h
index 078ce130b4..9b70f5d6f6 100644
--- a/Mesh/BackgroundMesh3D.h
+++ b/Mesh/BackgroundMesh3D.h
@@ -18,7 +18,7 @@
#include "pointInsertion.h"
#if defined(HAVE_ANN)
-#include <ANN/ANN.h>
+#include "ANN/ANN.h"
class ANNkd_tree;
#endif
diff --git a/Mesh/CenterlineField.cpp b/Mesh/CenterlineField.cpp
index 3a743493e5..e776297ce7 100644
--- a/Mesh/CenterlineField.cpp
+++ b/Mesh/CenterlineField.cpp
@@ -44,8 +44,7 @@
#include "meshGRegion.h"
#if defined(HAVE_ANN)
-#include <ANN/ANN.h>
-
+#include "ANN/ANN.h"
static void erase(std::vector<MLine*>& lines, MLine* l)
{
diff --git a/Mesh/meshGFaceElliptic.cpp b/Mesh/meshGFaceElliptic.cpp
index 9965244240..dab38e12a2 100644
--- a/Mesh/meshGFaceElliptic.cpp
+++ b/Mesh/meshGFaceElliptic.cpp
@@ -27,7 +27,7 @@
#include "fullMatrix.h"
#include "CenterlineField.h"
#if defined(HAVE_ANN)
-#include <ANN/ANN.h>
+#include "ANN/ANN.h"
#endif
#define TRAN_QUAD(c1,c2,c3,c4,s1,s2,s3,s4,u,v) \
diff --git a/contrib/mobile/utils/onelab_android_build.sh b/contrib/mobile/utils/onelab_android_build.sh
index f30103c9f0..a59de38742 100755
--- a/contrib/mobile/utils/onelab_android_build.sh
+++ b/contrib/mobile/utils/onelab_android_build.sh
@@ -36,7 +36,7 @@ if [ ! -d "$gmsh_svn/build_android" ] || [ ! -f "$gmsh_svn/build_android/CMakeCa
mkdir $gmsh_svn/build_android
fi
cd $gmsh_svn/build_android
-cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_SHARED=1 -DENABLE_MATHEX=1 -DENABLE_MESH=1 -DENABLE_ONELAB=1 -DENABLE_PARSER=1 -DENABLE_POST=1 -DENABLE_TETGEN=1 -DBLAS_LIB="$petsc_lib/libf2cblas.so" -DLAPACK_LIB="$petsc_lib/libf2clapack.so" ..
+cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_SHARED=1 -DENABLE_MATHEX=1 -DENABLE_MESH=1 -DENABLE_ONELAB=1 -DENABLE_PARSER=1 -DENABLE_POST=1 -DENABLE_ANN=1 -DENABLE_TETGEN=1 -DBLAS_LIB="$petsc_lib/libf2cblas.so" -DLAPACK_LIB="$petsc_lib/libf2clapack.so" ..
check
make androidGmsh -j$cmake_thread
check
diff --git a/contrib/mobile/utils/onelab_ios_build.sh b/contrib/mobile/utils/onelab_ios_build.sh
index 6e7930880a..ae479714d6 100755
--- a/contrib/mobile/utils/onelab_ios_build.sh
+++ b/contrib/mobile/utils/onelab_ios_build.sh
@@ -29,7 +29,7 @@ function build_gmsh {
mkdir $gmsh_svn/build_ios_$1
fi
cd $gmsh_svn/build_ios_$1
- cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_LIB=1 -DENABLE_MATHEX=1 -DENABLE_MESH=1 -DENABLE_ONELAB=1 -DENABLE_PARSER=1 -DENABLE_POST=1 -DENABLE_TETGEN=1 -DCMAKE_OSX_ARCHITECTURES="$1" ..
+ cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_LIB=1 -DENABLE_MATHEX=1 -DENABLE_MESH=1 -DENABLE_ONELAB=1 -DENABLE_PARSER=1 -DENABLE_POST=1 -DENABLE_ANN=1 -DENABLE_TETGEN=1 -DCMAKE_OSX_ARCHITECTURES="$1" ..
check
$build_cmd
check
diff --git a/contrib/mobile/utils/onelab_iossimulator_build.sh b/contrib/mobile/utils/onelab_iossimulator_build.sh
index 77ea8e6300..1fa4b42ccf 100755
--- a/contrib/mobile/utils/onelab_iossimulator_build.sh
+++ b/contrib/mobile/utils/onelab_iossimulator_build.sh
@@ -17,7 +17,7 @@ function build_gmsh {
mkdir $gmsh_svn/build_iossimulator
fi
cd $gmsh_svn/build_iossimulator
- cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_LIB=1 -DENABLE_MATHEX=1 -DENABLE_MESH=1 -DENABLE_ONELAB=1 -DENABLE_PARSER=1 -DENABLE_POST=1 -DENABLE_TETGEN=1 ..
+ cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_LIB=1 -DENABLE_MATHEX=1 -DENABLE_MESH=1 -DENABLE_ONELAB=1 -DENABLE_PARSER=1 -DENABLE_POST=1 -DENABLE_ANN=1 -DENABLE_TETGEN=1 ..
$build_cmd
$headers_cmd
cd -
--
GitLab