Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dg
dg
Commits
72eb82d5
Commit
72eb82d5
authored
May 25, 2016
by
Jonathan Lambrechts
Browse files
remove dg_add_include_directories (confusing), avoid external include in header files
parent
7a8a831d
Pipeline
#418
failed with stage
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
72eb82d5
...
...
@@ -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
View file @
72eb82d5
...
...
@@ -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_dir
ectories
(
${
PNETCDF_INC
}
)
endif
(
PNETCDF_INC
)
endif
(
PNETCDF_LIB
)
endif
(
ENABLE_PNETCDF
)
...
...
modules/slim3d/slim3dNetCDFIO.cpp
View file @
72eb82d5
#include "slim3dNetCDFIO.h"
#ifdef HAVE_PNETCDF
#include "pnetcdf.h"
#include "netcdf.h"
#include "mpi.h"
mpiArrayStructure
::
mpiArrayStructure
(
dgGroupCollection
*
groups
)
{
...
...
modules/slim3d/slim3dNetCDFIO.h
View file @
72eb82d5
...
...
@@ -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
View file @
72eb82d5
...
...
@@ -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_dir
ectories
(
${
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_dir
ectories
(
${
FES_INC
}
)
endif
(
FES_INC AND FES_DATA
)
endif
(
FES_LIB
)
endif
(
ENABLE_FES
)
...
...
modules/slimFunction/ncDataDz.h
View file @
72eb82d5
...
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment