install all headers to INCDIR

CMakeLists.txt

@@ -97,6 +97,7 @@ include_directories ("${PROJECT_BINARY_DIR}")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake_modules")
 
+set(INCDIR include CACHE PATH "install directory for header files")
 if(APPLE)
   set(ng_install_dir_bin ../MacOS)
   set(ng_install_dir_lib ../MacOS)
@@ -190,8 +191,8 @@ if (USE_PYTHON)
     include_directories(${PYBIND_INCLUDE_DIR})
     include_directories(${PYTHON_INCLUDE_DIRS})
 
-    install(DIRECTORY ${PYBIND_INCLUDE_DIR}/pybind11 DESTINATION include COMPONENT netgen_devel)
-    install(FILES ${PYBIND_INCLUDE_DIR}/../LICENSE DESTINATION include/pybind11 COMPONENT netgen_devel)
+    install(DIRECTORY ${PYBIND_INCLUDE_DIR}/pybind11 DESTINATION ${INCDIR} COMPONENT netgen_devel)
+    install(FILES ${PYBIND_INCLUDE_DIR}/../LICENSE DESTINATION ${INCDIR}/pybind11 COMPONENT netgen_devel)
 endif (USE_PYTHON)
 
 #######################################################################

cmake_modules/NetgenConfig.cmake.in

@@ -1,7 +1,7 @@
 set(PACKAGE_VERSION "@NETGEN_VERSION@")
 set(NETGEN_DIR "@CMAKE_INSTALL_PREFIX@")
 
-set(NETGEN_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include")
+set(NETGEN_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/@INCDIR@")
 set(NETGEN_SOURCE_DIR "@PROJECT_SOURCE_DIR@")
 
 set(NETGEN_CMAKE_THREAD_LIBS_INIT "@CMAKE_THREAD_LIBS_INIT@")
@@ -14,7 +14,7 @@ set(NETGEN_METIS_LIBRARY "@METIS_LIBRARY@")
 set(NETGEN_MKL_LIBRARIES "@MKL_LIBRARIES@")
 set(NETGEN_MPI_CXX_INCLUDE_PATH "@MPI_CXX_INCLUDE_PATH@")
 set(NETGEN_MPI_CXX_LIBRARIES "@MPI_CXX_LIBRARIES@")
-set(NETGEN_INCLUDE_DIRS "@PROJECT_SOURCE_DIR@/libsrc/include;@PROJECT_SOURCE_DIR@/libsrc/general;@PROJECT_SOURCE_DIR@/libsrc/visualization")
+set(NETGEN_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/@INCDIR@;@CMAKE_INSTALL_PREFIX@/@INCDIR@/include")
 set(NETGEN_OCC_INCLUDE_DIR "@OCC_INCLUDE_DIR@")
 set(NETGEN_OCC_LIBRARIES_BIN "@OCC_LIBRARIES_BIN@")
 set(NETGEN_OCC_LIBRARIES "@OCC_LIBRARIES@")

libsrc/csg/CMakeLists.txt

@@ -29,3 +29,12 @@ if(USE_GUI)
     endif(NOT WIN32)
 endif(USE_GUI)
 
+install(FILES
+  algprim.hpp brick.hpp csgeom.hpp csg.hpp csgparser.hpp
+  curve2d.hpp edgeflw.hpp explicitcurve2d.hpp extrusion.hpp
+  gencyl.hpp geoml.hpp identify.hpp manifold.hpp meshsurf.hpp
+  polyhedra.hpp revolution.hpp singularref.hpp solid.hpp
+  specpoin.hpp spline3d.hpp splinesurface.hpp surface.hpp
+  triapprox.hpp vscsg.hpp
+  DESTINATION ${INCDIR}/csg COMPONENT netgen_devel
+)

libsrc/general/CMakeLists.txt

@@ -8,5 +8,14 @@ add_library(gen OBJECT
 
 set_target_properties( gen PROPERTIES POSITION_INDEPENDENT_CODE ON )
 
-install( FILES ngexception.hpp DESTINATION include COMPONENT netgen_devel )
+install( FILES ngexception.hpp DESTINATION ${INCDIR} COMPONENT netgen_devel )
 
+install(FILES
+  archive_base.hpp array.hpp autodiff.hpp autoptr.hpp bitarray.hpp
+  dynamicmem.hpp flags.hpp hashtabl.hpp mpi_interface.hpp myadt.hpp
+  mysimd.hpp mystring.hpp netgenout.hpp ngexception.hpp ngpython.hpp
+  optmem.hpp parthreads.hpp profiler.hpp seti.hpp sort.hpp
+  spbita2d.hpp stack.hpp symbolta.hpp table.hpp template.hpp
+  gzstream.h
+  DESTINATION ${INCDIR}/general COMPONENT netgen_devel
+)

libsrc/geom2d/CMakeLists.txt

@@ -17,3 +17,8 @@ if(USE_GUI)
     endif(NOT WIN32)
 endif(USE_GUI)
 
+install(FILES
+  geom2dmesh.hpp geometry2d.hpp spline2d.hpp
+  splinegeometry2.hpp vsgeom2d.hpp
+  DESTINATION ${INCDIR}/geom2d COMPONENT netgen_devel
+)

libsrc/gprim/CMakeLists.txt

@@ -6,3 +6,9 @@ add_library(gprim OBJECT
 
 set_target_properties( gprim PROPERTIES POSITION_INDEPENDENT_CODE ON )
 
+install(FILES
+  adtree.hpp geom2d.hpp geom3d.hpp geomfuncs.hpp geomobjects2.hpp
+  geomobjects.hpp geomops2.hpp geomops.hpp geomtest3d.hpp gprim.hpp
+  splinegeometry.hpp spline.hpp transform3d.hpp
+  DESTINATION ${INCDIR}/gprim COMPONENT netgen_devel
+)

libsrc/include/CMakeLists.txt

@@ -1,2 +1,10 @@
-install(FILES nginterface.h nginterface_v2.hpp DESTINATION include COMPONENT netgen_devel)
+install(FILES nginterface.h nginterface_v2.hpp DESTINATION ${INCDIR} COMPONENT netgen_devel)
+
+install(FILES
+  acisgeom.hpp csg.hpp geometry2d.hpp gprim.hpp incopengl.hpp
+  inctcl.hpp incvis.hpp linalg.hpp meshing.hpp myadt.hpp mydefs.hpp
+  mystdlib.h nginterface_v2_impl.hpp occgeom.hpp
+  opti.hpp parallel.hpp parallelinterface.hpp stlgeom.hpp visual.hpp
+  DESTINATION ${INCDIR}/include COMPONENT netgen_devel
+  )
 

libsrc/interface/CMakeLists.txt

@@ -23,3 +23,7 @@ if(NOT WIN32)
     install( TARGETS interface ${ng_install_dir})
 endif(NOT WIN32)
 
+install(FILES
+  writeuser.hpp
+  DESTINATION ${INCDIR}/interface COMPONENT netgen_devel
+)

libsrc/linalg/CMakeLists.txt

@@ -3,3 +3,9 @@ add_library( la OBJECT
         )
 
 set_target_properties(la PROPERTIES POSITION_INDEPENDENT_CODE ON )
+
+install(FILES
+  densemat.hpp linalg.hpp opti.hpp
+  polynomial.hpp vector.hpp
+  DESTINATION ${INCDIR}/linalg COMPONENT netgen_devel
+)

libsrc/meshing/CMakeLists.txt

@@ -33,3 +33,14 @@ if(NOT WIN32)
     install( TARGETS mesh ${ng_install_dir})
 endif(NOT WIN32)
 
+install(FILES
+  adfront2.hpp adfront3.hpp basegeom.hpp bcfunctions.hpp bisect.hpp
+  boundarylayer.hpp classifyhpel.hpp clusters.hpp curvedelems.hpp
+  findip2.hpp findip.hpp geomsearch.hpp global.hpp hpref_hex.hpp
+  hprefinement.hpp hpref_prism.hpp hpref_pyramid.hpp hpref_quad.hpp
+  hpref_segm.hpp hpref_tet.hpp hpref_trig.hpp improve2.hpp improve3.hpp
+  localh.hpp meshclass.hpp meshfunc.hpp meshing2.hpp meshing3.hpp
+  meshing.hpp meshtool.hpp meshtype.hpp msghandler.hpp paralleltop.hpp
+  ruler2.hpp ruler3.hpp specials.hpp topology.hpp validate.hpp
+  DESTINATION ${INCDIR}/meshing COMPONENT netgen_devel
+)

libsrc/occ/CMakeLists.txt

@@ -12,3 +12,7 @@ if(NOT WIN32)
     install( TARGETS occ occvis ${ng_install_dir})
 endif(NOT WIN32)
 
+install(FILES
+  occgeom.hpp occmeshsurf.hpp vsocc.hpp
+  DESTINATION ${INCDIR}/occ COMPONENT netgen_devel
+)

libsrc/stlgeom/CMakeLists.txt

@@ -19,3 +19,8 @@ if(USE_GUI)
     endif(NOT WIN32)
 endif(USE_GUI)
 
+install(FILES
+  meshstlsurface.hpp stlgeom.hpp stlline.hpp
+  stltool.hpp stltopology.hpp vsstl.hpp
+  DESTINATION ${INCDIR}/stlgeom COMPONENT netgen_devel
+)

libsrc/visualization/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_definitions(-DNGINTERFACE_EXPORTS)
-install(FILES soldata.hpp DESTINATION include COMPONENT netgen_devel )
+install(FILES soldata.hpp DESTINATION ${INCDIR} COMPONENT netgen_devel )
 
 # AM_CPPFLAGS =  $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include  -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(OCCFLAGS) $(TCL_INCLUDES)
 
@@ -16,7 +16,8 @@ if(NOT WIN32)
     install( TARGETS visual ${ng_install_dir})
 endif(NOT WIN32)
 
-
-
-
-
+install(FILES
+  meshdoc.hpp mvdraw.hpp
+  vispar.hpp visual.hpp vssolution.hpp
+  DESTINATION ${INCDIR}/visualization COMPONENT netgen_devel
+)