diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0dffaea..a643c60 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,14 @@ + +set( SHIVA_ENABLE_UNIT_TESTS OFF CACHE BOOL "" FORCE ) +set( SHIVA_ENABLE_BENCHMARKS OFF CACHE BOOL "" FORCE ) +set( SHIVA_ENABLE_EXAMPLES OFF CACHE BOOL "" FORCE ) +set( SHIVA_ENABLE_BLT OFF CACHE BOOL "" FORCE ) +set( SHIVA_ENABLE_CAMP OFF CACHE BOOL "" FORCE ) +set( SHIVA_ENABLE_BOUNDS_CHECKS OFF CACHE BOOL "" FORCE ) + + add_subdirectory(Shiva) -shiva_add_code_checks( PREFIX SEMKernels - EXCLUDES "Shiva/*" ) + + add_subdirectory(finiteElement) diff --git a/src/Shiva b/src/Shiva index 2db51da..9034f3f 160000 --- a/src/Shiva +++ b/src/Shiva @@ -1 +1 @@ -Subproject commit 2db51da105e9a82fbdf01390c69401afc8821410 +Subproject commit 9034f3fb66559f6117b6a08a883cb61688ed86f1 diff --git a/src/finiteElement/shiva/SEMQkGLIntegralsShiva.hpp b/src/finiteElement/shiva/SEMQkGLIntegralsShiva.hpp index 8e40062..0bdabea 100644 --- a/src/finiteElement/shiva/SEMQkGLIntegralsShiva.hpp +++ b/src/finiteElement/shiva/SEMQkGLIntegralsShiva.hpp @@ -3,16 +3,16 @@ #include "common/macros.hpp" #include "common/mathUtilites.hpp" -#include "functions/bases/LagrangeBasis.hpp" -#include "functions/quadrature/Quadrature.hpp" -#include "functions/spacing/Spacing.hpp" -#include "geometry/shapes/NCube.hpp" -#include "geometry/shapes/InterpolatedShape.hpp" -#include "geometry/mapping/LinearTransform.hpp" -#include "common/ShivaMacros.hpp" -#include "common/pmpl.hpp" -#include "common/types.hpp" -#include "discretizations/finiteElementMethod/parentElements/ParentElement.hpp" +#include "shiva/functions/bases/LagrangeBasis.hpp" +#include "shiva/functions/quadrature/Quadrature.hpp" +#include "shiva/functions/spacing/Spacing.hpp" +#include "shiva/geometry/shapes/NCube.hpp" +#include "shiva/geometry/shapes/InterpolatedShape.hpp" +#include "shiva/geometry/mapping/LinearTransform.hpp" +#include "shiva/common/ShivaMacros.hpp" +#include "shiva/common/pmpl.hpp" +#include "shiva/common/types.hpp" +#include "shiva/discretizations/finiteElementMethod/parentElements/ParentElement.hpp" #include