moving ULg/UCL copyrighted code out of main source tree: step 2 (more work on CMakeLists)

contrib/TetgenNew/CMakeLists.txt

@@ -19,5 +19,5 @@ set(SRC
   surface.cxx
 )
 
-file(GLOB_RECURSE HDR RELATIVE ${CMAKE_SOURCE_DIR}/contrib/TetgenNew *.h)
+file(GLOB_RECURSE HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
 append_gmsh_src(contrib/TetgenNew "${SRC};${HDR}")

contrib/kbipack/CMakeLists.txt

@@ -11,5 +11,5 @@ set(SRC
   mpz.cpp
 )
 
-file(GLOB_RECURSE HDR RELATIVE ${CMAKE_SOURCE_DIR}/contrib/kbipack *.h)
+file(GLOB_RECURSE HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
 append_gmsh_src(contrib/kbipack "${SRC};${HDR}")

doc/texinfo/gmsh.texi

@@ -846,8 +846,10 @@ Set geometrical tolerance
 @ftable @code
 @item -1, -2, -3
 Perform 1D, 2D or 3D mesh generation, then exit
+@item -refine
+Perform uniform mesh refinement by subdivision, then exit
 @item -part int
-Partition the mesh after batch mesh generation.
+Partition the mesh after batch mesh generation
 @item -saveall
 Save all elements (discard physical group definitions)
 @item -o file
@@ -3674,7 +3676,8 @@ element. By default, the first @var{tag} is the number of the physical
 entity to which the element belongs; the second is the number of the
 elementary geometrical entity to which the element belongs; the third is
 the number of mesh partitions to which the element belongs, followed by
-the partition ids. A zero tag is equivalent to no tag.
+the partition ids (negative partition ids indicate ghost cells). A zero
+tag is equivalent to no tag.
 
 @item @var{node-number-list}
 is the list of the node numbers of the @var{n}-th element. The ordering of

utils/api_demos/mainAntTweakBar.cpp

@@ -9,10 +9,10 @@
 #  include <GL/glut.h>
 #endif
 #include <AntTweakBar.h>
-#include <gmsh/Gmsh.h>
-#include <gmsh/GModel.h>
-#include <gmsh/MElement.h>
-#include <gmsh/drawContext.h>
+#include "Gmsh.h"
+#include "GModel.h"
+#include "MElement.h"
+#include "drawContext.h"
 
 static drawContext *ctx = 0;
 static mousePosition clickPos, prevPos;

utils/api_demos/mainCartesian.cpp

-#include <gmsh/Gmsh.h>
-#include <gmsh/GModel.h>
-#include <gmsh/MVertex.h>
-#include <gmsh/cartesian.h>
-#include <gmsh/MTriangle.h>
-#include <gmsh/SOrientedBoundingBox.h>
-#include <gmsh/Numeric.h>
-
-void insertBoxes ( double x, double y, double z, double EP, cartesianBox<double> &box){
-  
+#include "Gmsh.h"
+#include "GModel.h"
+#include "MVertex.h"
+#include "cartesian.h"
+#include "MTriangle.h"
+#include "SOrientedBoundingBox.h"
+#include "Numeric.h"
+
+void insertBoxes ( double x, double y, double z, double EP, cartesianBox<double> &box)
+{
   int id1 = box.index_of_element(x-EP,y-EP,z-EP);      
   int id2 = box.index_of_element(x+EP,y+EP,z+EP);      
   int i1,j1,k1;
@@ -25,7 +25,8 @@ void insertBoxes ( double x, double y, double z, double EP, cartesianBox<double>
   }
 }
 
-void test(){
+void test()
+{
   printf("enter z coordinate : ");
   double x,y,z=-1;
   scanf ("%lf",&z);
@@ -49,11 +50,10 @@ void test(){
   }
   fprintf(f,"};\n");
   fclose(f);
-  
 }
 
-int main (int argc,char *argv[]){
-  
+int main (int argc,char *argv[])
+{
   //  test();
   //  return 1;
 

utils/api_demos/mainElasticity.cpp

-#include <gmsh/Gmsh.h>
-#include <gmsh/elasticitySolver.h>
-#include <gmsh/PView.h>
-#include <gmsh/PViewData.h>
+#include "Gmsh.h"
+#include "elasticitySolver.h"
+#include "PView.h"
+#include "PViewData.h"
 
 int main (int argc, char* argv[]){
   

utils/api_demos/mainGlut.cpp

@@ -7,10 +7,10 @@
 #else
 #  include <GL/glut.h>
 #endif
-#include <Gmsh/Gmsh.h>
-#include <gmsh/GModel.h>
-#include <gmsh/MElement.h>
-#include <Gmsh/drawContext.h>
+#include "Gmsh.h"
+#include "GModel.h"
+#include "MElement.h"
+#include "drawContext.h"
 
 drawContext *ctx = 0;
 

utils/api_demos/mainHomology.cpp

@@ -8,12 +8,11 @@
 
 #include <stdio.h>
 #include <sstream>
-#include <gmsh/Gmsh.h>
-#include <gmsh/GModel.h>
-#include <gmsh/MElement.h>
-#include <gmsh/CellComplex.h>
-//#include <gmsh/ChainComplex.h>
-#include <gmsh/Homology.h>
+#include "Gmsh.h"
+#include "GModel.h"
+#include "MElement.h"
+#include "CellComplex.h"
+#include "Homology.h"
 
 int main(int argc, char **argv)
 {

utils/api_demos/mainLevelset.cpp

 
-#include "../../contrib/DiscreteIntegration/Integration3D.h"
-#include <gmsh/Gmsh.h>
-#include <gmsh/GModel.h>
-#include <gmsh/MElement.h>
-#include <gmsh/MHexahedron.h>
-#include <gmsh/MTetrahedron.h>
-#include <gmsh/MQuadrangle.h>
-#include <gmsh/MTriangle.h>
-#include <gmsh/MLine.h>
-#include "../../contrib/DiscreteIntegration/DILevelset.h"
 #include <time.h>
 #include <iostream>
 #include <queue>
 #include <limits>
+#include "Gmsh.h"
+#include "GModel.h"
+#include "MElement.h"
+#include "MHexahedron.h"
+#include "MTetrahedron.h"
+#include "MQuadrangle.h"
+#include "MTriangle.h"
+#include "MLine.h"
+#include "Integration3D.h"
+#include "DILevelset.h"
 
 #define PI 3.14159265
 

utils/api_demos/mainOcc.cpp

@@ -13,10 +13,10 @@
 // -lTKMath -lTKernel -lm
 
 #include <stdio.h>
-#include <gmsh/Gmsh.h>
-#include <gmsh/GmshConfig.h>
-#include <gmsh/GModel.h>
-#include <gmsh/MElement.h>
+#include "Gmsh.h"
+#include "GmshConfig.h"
+#include "GModel.h"
+#include "MElement.h"
 
 #if !defined(HAVE_NO_OCC_CONFIG_H)
 #include "config.h"

utils/api_demos/mainPost.cpp

-#include <gmsh/Gmsh.h>
-#include <gmsh/GModel.h>
-#include <gmsh/MVertex.h>
-#include <gmsh/PView.h>
-#include <gmsh/PViewData.h>
-#include <gmsh/PluginManager.h>
+#include "Gmsh.h"
+#include "GModel.h"
+#include "MVertex.h"
+#include "PView.h"
+#include "PViewData.h"
+#include "PluginManager.h"
 
 int main(int argc, char **argv)
 {

utils/api_demos/mainSimple.cpp

 #include <stdio.h>
-#include <gmsh/Gmsh.h>
-#include <gmsh/GModel.h>
-#include <gmsh/MElement.h>
+#include "Gmsh.h"
+#include "GModel.h"
+#include "MElement.h"
 
 int main(int argc, char **argv)
 {