Skip to content
GitLab
Commit e6b434e7 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#1039 Modify the include convention so that all paths are preffixed by... 

#1039 Modify the include convention so that all paths are preffixed by HappyHeart. The reason is to avoid conflict when library is used in another context (for instance Gautier struggled with HappyHeartVerdandi because he couldn't name his folder with main folder names already used in HappyHeart library).
parent 9fe08517
Hide whitespace changes
Inline Side-by-side
HappyHeart 0 → 120000
View file @ e6b434e7
Sources
\ No newline at end of file
HappyHeart.xcodeproj/project.pbxproj
View file @ e6b434e7
......@@ -19383,7 +19383,7 @@
SDKROOT = macosx;
STRIP_INSTALLED_PRODUCT = NO;
STRIP_STYLE = all;
USER_HEADER_SEARCH_PATHS = Sources;
USER_HEADER_SEARCH_PATHS = .;
VALIDATE_PRODUCT = NO;
WARNING_CFLAGS = (
"-Weverything",
......@@ -19499,7 +19499,7 @@
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
SDKROOT = macosx;
STRIP_STYLE = all;
USER_HEADER_SEARCH_PATHS = Sources;
USER_HEADER_SEARCH_PATHS = .;
VALIDATE_PRODUCT = NO;
WARNING_CFLAGS = (
"-Weverything",
SCons/custom_scons_functions.py
View file @ e6b434e7
......@@ -225,8 +225,8 @@ def DefineEnvironment(vars):
#env['ENV']['TERM'] = os.environ['TERM']
env['HAPPY_HEART_SRC'] = os.getcwd()
env['HAPPY_HEART_SCONS'] = os.path.join(env['HAPPY_HEART_SRC'], '..', 'SCons')
env['HAPPY_HEART_ROOT'] = os.path.join(os.getcwd(), '..')
env['HAPPY_HEART_SCONS'] = os.path.join(env['HAPPY_HEART_ROOT'], 'SCons')
macro_flags = [
'OPS_WITH_EXCEPTION',
......@@ -317,8 +317,8 @@ def DefineEnvironment(vars):
# List of include directories.
include_dirs = [
env['HAPPY_HEART_SRC'],
os.path.join(env['HAPPY_HEART_SRC'], 'ThirdParty', 'Source'),
env['HAPPY_HEART_ROOT'],
os.path.join(env['HAPPY_HEART_ROOT'], 'Sources', 'ThirdParty', 'Source'),
env['OPEN_MPI_INCL_DIR'],
env['PETSC_GENERAL_INCL_DIR'],
env['PETSC_MODE_INCL_DIR'],
......
Sources/Core/Crtp/NumberingSubsetForMatrix.hpp
View file @ e6b434e7
......@@ -104,7 +104,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Core/Crtp/NumberingSubsetForMatrix.hxx"
# include "HappyHeart/Core/Crtp/NumberingSubsetForMatrix.hxx"
#endif // HAPPY_HEART_x_CORE_x_CRTP_x_NUMBERING_SUBSET_FOR_MATRIX_HPP_
Sources/Core/InitHappyHeart.hpp
View file @ e6b434e7
......@@ -12,18 +12,18 @@
# define HAPPY_HEART_x_CORE_x_INIT_HAPPY_HEART_HPP_
# include "ThirdParty/Wrappers/Mpi/Mpi.hpp"
# include "ThirdParty/Wrappers/Petsc/Petsc.hpp"
# include "ThirdParty/Wrappers/Petsc/Print.hpp"
# include "HappyHeart/ThirdParty/Wrappers/Mpi/Mpi.hpp"
# include "HappyHeart/ThirdParty/Wrappers/Petsc/Petsc.hpp"
# include "HappyHeart/ThirdParty/Wrappers/Petsc/Print.hpp"
# include "Utilities/CommandLineOptions/CommandLineOptions.hpp"
# include "Utilities/Filesystem/File.hpp"
# include "Utilities/InputParameterList/Base.hpp"
# include "Utilities/TimeKeep/TimeKeep.hpp"
# include "Utilities/Environment/EnvironmentVariable.hpp"
# include "HappyHeart/Utilities/CommandLineOptions/CommandLineOptions.hpp"
# include "HappyHeart/Utilities/Filesystem/File.hpp"
# include "HappyHeart/Utilities/InputParameterList/Base.hpp"
# include "HappyHeart/Utilities/TimeKeep/TimeKeep.hpp"
# include "HappyHeart/Utilities/Environment/EnvironmentVariable.hpp"
# include "Core/InputParameter/Result.hpp"
# include "Core/InitTimeKeepLog.hpp"
# include "HappyHeart/Core/InputParameter/Result.hpp"
# include "HappyHeart/Core/InitTimeKeepLog.hpp"
namespace HappyHeart
......@@ -102,7 +102,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Core/InitHappyHeart.hxx"
# include "HappyHeart/Core/InitHappyHeart.hxx"
#endif // HAPPY_HEART_x_CORE_x_INIT_HAPPY_HEART_HPP_
Sources/Core/InitTimeKeepLog.hpp
View file @ e6b434e7
......@@ -11,13 +11,13 @@
#ifndef HAPPY_HEART_x_CORE_x_INIT_TIME_KEEP_LOG_HPP_
# define HAPPY_HEART_x_CORE_x_INIT_TIME_KEEP_LOG_HPP_
# include "ThirdParty/Wrappers/Mpi/Mpi.hpp"
# include "HappyHeart/ThirdParty/Wrappers/Mpi/Mpi.hpp"
# include "Utilities/TimeKeep/TimeKeep.hpp"
# include "Utilities/Filesystem/File.hpp"
# include "HappyHeart/Utilities/TimeKeep/TimeKeep.hpp"
# include "HappyHeart/Utilities/Filesystem/File.hpp"
# include "Core/InputParameterData/InputParameterList.hpp"
# include "Core/InputParameter/Result.hpp"
# include "HappyHeart/Core/InputParameterData/InputParameterList.hpp"
# include "HappyHeart/Core/InputParameter/Result.hpp"
namespace HappyHeart
......@@ -48,7 +48,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Core/InitTimeKeepLog.hxx"
# include "HappyHeart/Core/InitTimeKeepLog.hxx"
#endif // HAPPY_HEART_x_CORE_x_INIT_TIME_KEEP_LOG_HPP_
Sources/Core/InputParameter/Crtp/Section.cpp
View file @ e6b434e7
......@@ -8,7 +8,7 @@
// Copyright (c) 2015 Inria. All rights reserved.
//
#include "Core/InputParameter/Crtp/Section.hpp"
#include "HappyHeart/Core/InputParameter/Crtp/Section.hpp"
namespace HappyHeart
......
Sources/Core/InputParameter/Crtp/Section.hpp
View file @ e6b434e7
......@@ -13,8 +13,8 @@
# include <string>
# include "Utilities/InputParameterList/Crtp/Section.hpp"
# include "Utilities/InputParameterList/Crtp/InputParameter.hpp"
# include "HappyHeart/Utilities/InputParameterList/Crtp/Section.hpp"
# include "HappyHeart/Utilities/InputParameterList/Crtp/InputParameter.hpp"
......@@ -68,7 +68,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Core/InputParameter/Crtp/Section.hxx"
# include "HappyHeart/Core/InputParameter/Crtp/Section.hxx"
#endif // HAPPY_HEART_x_CORE_x_INPUT_PARAMETER_x_CRTP_x_SECTION_HPP_
Sources/Core/InputParameter/DirichletBoundaryCondition/DirichletBoundaryCondition.hpp
View file @ e6b434e7
......@@ -11,10 +11,10 @@
#ifndef HAPPY_HEART_x_CORE_x_INPUT_PARAMETER_x_DIRICHLET_BOUNDARY_CONDITION_x_DIRICHLET_BOUNDARY_CONDITION_HPP_
# define HAPPY_HEART_x_CORE_x_INPUT_PARAMETER_x_DIRICHLET_BOUNDARY_CONDITION_x_DIRICHLET_BOUNDARY_CONDITION_HPP_
# include "Core/InputParameter/Crtp/Section.hpp"
# include "HappyHeart/Core/InputParameter/Crtp/Section.hpp"
# include "Core/InputParameter/Geometry/Domain.hpp"
# include "Core/InputParameter/DirichletBoundaryCondition/Private/DirichletBoundaryCondition.hpp"
# include "HappyHeart/Core/InputParameter/Geometry/Domain.hpp"
# include "HappyHeart/Core/InputParameter/DirichletBoundaryCondition/Private/DirichletBoundaryCondition.hpp"
namespace HappyHeart
......@@ -139,7 +139,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Core/InputParameter/DirichletBoundaryCondition/DirichletBoundaryCondition.hxx"
# include "HappyHeart/Core/InputParameter/DirichletBoundaryCondition/DirichletBoundaryCondition.hxx"
#endif // HAPPY_HEART_x_CORE_x_INPUT_PARAMETER_x_DIRICHLET_BOUNDARY_CONDITION_x_DIRICHLET_BOUNDARY_CONDITION_HPP_
Sources/Core/InputParameter/DirichletBoundaryCondition/Private/DirichletBoundaryCondition.cpp
View file @ e6b434e7
......@@ -8,9 +8,9 @@
// Copyright © 2015 Inria. All rights reserved.
//
#include "Utilities/String/EmptyString.hpp"
#include "HappyHeart/Utilities/String/EmptyString.hpp"
#include "Core/InputParameter/DirichletBoundaryCondition/Private/DirichletBoundaryCondition.hpp"
#include "HappyHeart/Core/InputParameter/DirichletBoundaryCondition/Private/DirichletBoundaryCondition.hpp"
namespace HappyHeart
......
Sources/Core/InputParameter/FElt/FEltSpace.hpp
View file @ e6b434e7
......@@ -11,9 +11,9 @@
#ifndef HAPPY_HEART_x_CORE_x_INPUT_PARAMETER_x_F_ELT_x_F_ELT_SPACE_HPP_
# define HAPPY_HEART_x_CORE_x_INPUT_PARAMETER_x_F_ELT_x_F_ELT_SPACE_HPP_
# include "Core/InputParameter/Crtp/Section.hpp"
# include "HappyHeart/Core/InputParameter/Crtp/Section.hpp"
# include "Core/InputParameter/FElt/Private/FEltSpace.hpp"
# include "HappyHeart/Core/InputParameter/FElt/Private/FEltSpace.hpp"
namespace HappyHeart
......@@ -130,7 +130,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Core/InputParameter/FElt/FEltSpace.hxx"
# include "HappyHeart/Core/InputParameter/FElt/FEltSpace.hxx"
#endif // HAPPY_HEART_x_CORE_x_INPUT_PARAMETER_x_F_ELT_x_F_ELT_SPACE_HPP_
Sources/Core/InputParameter/FElt/NumberingSubset.hpp
View file @ e6b434e7
......@@ -11,9 +11,9 @@
#ifndef HAPPY_HEART_x_CORE_x_INPUT_PARAMETER_x_F_ELT_x_NUMBERING_SUBSET_HPP_
# define HAPPY_HEART_x_CORE_x_INPUT_PARAMETER_x_F_ELT_x_NUMBERING_SUBSET_HPP_
# include "Core/InputParameter/Crtp/Section.hpp"
# include "Core/InputParameter/FElt/Private/NumberingSubset.hpp"
# include "Core/InputParameterData/InputParameterList.hpp"
# include "HappyHeart/Core/InputParameter/Crtp/Section.hpp"
# include "HappyHeart/Core/InputParameter/FElt/Private/NumberingSubset.hpp"
# include "HappyHeart/Core/InputParameterData/InputParameterList.hpp"
......@@ -111,7 +111,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Core/InputParameter/FElt/NumberingSubset.hxx"
# include "HappyHeart/Core/InputParameter/FElt/NumberingSubset.hxx"
#endif // HAPPY_HEART_x_CORE_x_INPUT_PARAMETER_x_F_ELT_x_NUMBERING_SUBSET_HPP_
Sources/Core/InputParameter/FElt/Private/FEltSpace.cpp
View file @ e6b434e7
......@@ -8,9 +8,9 @@
// Copyright (c) 2015 Inria. All rights reserved.
//
#include "Utilities/String/EmptyString.hpp"
#include "HappyHeart/Utilities/String/EmptyString.hpp"
#include "Core/InputParameter/FElt/Private/FEltSpace.hpp"
#include "HappyHeart/Core/InputParameter/FElt/Private/FEltSpace.hpp"
......
Sources/Core/InputParameter/FElt/Private/NumberingSubset.cpp
View file @ e6b434e7
......@@ -8,9 +8,9 @@
// Copyright (c) 2015 Inria. All rights reserved.
//
#include "Utilities/String/EmptyString.hpp"
#include "HappyHeart/Utilities/String/EmptyString.hpp"
#include "Core/InputParameter/FElt/Private/NumberingSubset.hpp"
#include "HappyHeart/Core/InputParameter/FElt/Private/NumberingSubset.hpp"
namespace HappyHeart
......
Sources/Core/InputParameter/FElt/Private/Unknown.cpp
View file @ e6b434e7
......@@ -8,9 +8,9 @@
// Copyright (c) 2015 Inria. All rights reserved.
//
#include "Utilities/String/EmptyString.hpp"
#include "HappyHeart/Utilities/String/EmptyString.hpp"
#include "Core/InputParameter/FElt/Private/Unknown.hpp"
#include "HappyHeart/Core/InputParameter/FElt/Private/Unknown.hpp"
namespace HappyHeart
......
Sources/Core/InputParameter/FElt/Unknown.hpp
View file @ e6b434e7
......@@ -11,9 +11,9 @@
#ifndef HAPPY_HEART_x_CORE_x_INPUT_PARAMETER_x_F_ELT_x_UNKNOWN_HPP_
# define HAPPY_HEART_x_CORE_x_INPUT_PARAMETER_x_F_ELT_x_UNKNOWN_HPP_
# include "Core/InputParameter/Crtp/Section.hpp"
# include "HappyHeart/Core/InputParameter/Crtp/Section.hpp"
# include "Core/InputParameter/FElt/Private/Unknown.hpp"
# include "HappyHeart/Core/InputParameter/FElt/Private/Unknown.hpp"
namespace HappyHeart
......@@ -110,7 +110,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Core/InputParameter/FElt/Unknown.hxx"
# include "HappyHeart/Core/InputParameter/FElt/Unknown.hxx"
#endif // HAPPY_HEART_x_CORE_x_INPUT_PARAMETER_x_F_ELT_x_UNKNOWN_HPP_
Sources/Core/InputParameter/Geometry/Domain.hpp
View file @ e6b434e7
......@@ -13,9 +13,9 @@
# include <string>
# include "Core/InputParameter/Crtp/Section.hpp"
# include "HappyHeart/Core/InputParameter/Crtp/Section.hpp"
# include "Core/InputParameter/Geometry/Private/Domain.hpp"
# include "HappyHeart/Core/InputParameter/Geometry/Private/Domain.hpp"
namespace HappyHeart
......@@ -119,7 +119,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Core/InputParameter/Geometry/Domain.hxx"
# include "HappyHeart/Core/InputParameter/Geometry/Domain.hxx"
#endif // HAPPY_HEART_x_CORE_x_INPUT_PARAMETER_x_GEOMETRY_x_DOMAIN_HPP_
Sources/Core/InputParameter/Geometry/InterpolationFile.cpp
View file @ e6b434e7
......@@ -8,9 +8,9 @@
// Copyright © 2015 Inria. All rights reserved.
//
#include "Utilities/String/EmptyString.hpp"
#include "HappyHeart/Utilities/String/EmptyString.hpp"
#include "Core/InputParameter/Geometry/InterpolationFile.hpp"
#include "HappyHeart/Core/InputParameter/Geometry/InterpolationFile.hpp"
namespace HappyHeart
......
Sources/Core/InputParameter/Geometry/InterpolationFile.hpp
View file @ e6b434e7
......@@ -13,8 +13,8 @@
# include <memory>
# include <vector>
# include "Utilities/InputParameterList/Crtp/InputParameter.hpp"
# include "Core/InputParameter/Crtp/Section.hpp"
# include "HappyHeart/Utilities/InputParameterList/Crtp/InputParameter.hpp"
# include "HappyHeart/Core/InputParameter/Crtp/Section.hpp"
namespace HappyHeart
......@@ -76,7 +76,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Core/InputParameter/Geometry/InterpolationFile.hxx"
# include "HappyHeart/Core/InputParameter/Geometry/InterpolationFile.hxx"
#endif // HAPPY_HEART_x_CORE_x_INPUT_PARAMETER_x_GEOMETRY_x_INTERPOLATION_FILE_HPP_
Sources/Core/InputParameter/Geometry/Mesh.hpp
View file @ e6b434e7
......@@ -13,9 +13,9 @@
# include <string>
# include "Core/InputParameter/Crtp/Section.hpp"
# include "HappyHeart/Core/InputParameter/Crtp/Section.hpp"
# include "Core/InputParameter/Geometry/Private/Mesh.hpp"
# include "HappyHeart/Core/InputParameter/Geometry/Private/Mesh.hpp"
namespace HappyHeart
......@@ -143,7 +143,7 @@ namespace HappyHeart
} // namespace HappyHeart
# include "Core/InputParameter/Geometry/Mesh.hxx"
# include "HappyHeart/Core/InputParameter/Geometry/Mesh.hxx"
#endif // HAPPY_HEART_x_CORE_x_INPUT_PARAMETER_x_GEOMETRY_x_MESH_HPP_
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment