remove dg_add_include_directories (confusing), avoid external include in header files

CMakeLists.txt

@@ -94,11 +94,6 @@ macro(dg_add_library LIBNAME)
   set(EXTERNAL_LIBRARIES ${EXTERNAL_LIBRARIES} PARENT_SCOPE)
 endmacro(dg_add_library)
 
-macro(dg_add_include_dir INCLUDEDIR)
-  list(APPEND EXTERNAL_INCLUDES ${INCLUDEDIR})
-  set(EXTERNAL_INCLUDES ${EXTERNAL_INCLUDES} PARENT_SCOPE)
-endmacro(dg_add_include_dir)
-
 if(ENABLE_PROJ)
   find_library (PROJ_LIB proj)
   if (PROJ_LIB)

modules/slim3d/CMakeLists.txt

@@ -6,7 +6,7 @@ if(ENABLE_PNETCDF)
     if (PNETCDF_INC)
       dg_set_module_option(HAVE_PNETCDF "PNetcdf")
       dg_add_library(${PNETCDF_LIB})
-      dg_add_include_dir(${PNETCDF_INC})
+      include_directories(${PNETCDF_INC})
     endif(PNETCDF_INC)
   endif(PNETCDF_LIB)
 endif(ENABLE_PNETCDF)

modules/slim3d/slim3dNetCDFIO.cpp

 #include "slim3dNetCDFIO.h"
 #ifdef HAVE_PNETCDF
+#include "pnetcdf.h"
+#include "netcdf.h"
+#include "mpi.h"
 
 mpiArrayStructure::mpiArrayStructure(dgGroupCollection* groups)
 {

modules/slim3d/slim3dNetCDFIO.h

@@ -6,12 +6,9 @@
 #include "dgDofContainer.h"
 #include "dgGroupOfElements.h"
 #include "dgExtrusion.h"
-#include "netcdf.h"
-#include "pnetcdf.h"
 #include <iomanip>
 #include <iostream>
 #include <sstream>
-#include <mpi.h>
 
 class mpiArrayStructure {
 protected :

modules/slimFunction/CMakeLists.txt

@@ -20,7 +20,7 @@ if(ENABLE_NETCDF)
     find_path (NETCDF_INC "netcdf.h" PATH_SUFFIXES include)
     if (NETCDF_INC)
       dg_set_module_option(HAVE_NETCDF "Netcdf")
-      dg_add_include_dir(${NETCDF_INC})
+      include_directories(${NETCDF_INC})
       dg_add_library(${NETCDF_LIB})
     endif(NETCDF_INC)
   endif(NETCDF_LIB)
@@ -36,7 +36,7 @@ if(ENABLE_FES)
       set(HAVE_FES TRUE)
       dg_set_module_option(HAVE_FES "FES")
       dg_add_library(${FES_LIB})
-      dg_add_include_dir(${FES_INC})
+      include_directories(${FES_INC})
     endif(FES_INC AND FES_DATA)
   endif(FES_LIB)
 endif(ENABLE_FES)

modules/slimFunction/ncDataDz.h

@@ -7,9 +7,6 @@
 
 #ifdef HAVE_NETCDF
 
-#define NC_CHECK(code) {int status = code; if (status!= NC_NOERR) Msg::Error("netcdf at line %i in file %s : %s", __LINE__, __FILE__, nc_strerror(status));}
-#include "netcdf.h"
-
 //************************************************************
 /**Function using the slimStructDataContainer and the slimStructDataInterpolator classes */
 class ncDataDz {