Commit 769fa5f6 authored by Martin Heistermann's avatar Martin Heistermann

Include Config/ headers not with using ../, but as OpenVolumeMesh/Config/.. to...

Include Config/ headers not with using ../, but as OpenVolumeMesh/Config/.. to always get one from OVM, not from a project that is using OVM.
parent 441a7907
......@@ -98,7 +98,7 @@ target_compile_definitions(OpenVolumeMesh
target_include_directories(OpenVolumeMesh
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/OpenVolumeMesh/Config>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
......
......@@ -36,7 +36,7 @@
#include "../Core/OpenVolumeMeshProperty.hh"
#include "../Core/OpenVolumeMeshHandle.hh"
#include "../Core/PropertyDefines.hh"
#include "../Config/Export.hh"
#include "OpenVolumeMesh/Config/Export.hh"
#include "../Core/TopologyKernel.hh"
namespace OpenVolumeMesh {
......
......@@ -36,7 +36,7 @@
#define STATUS_HH_
#include <iosfwd>
#include "../Config/Export.hh"
#include "OpenVolumeMesh/Config/Export.hh"
namespace OpenVolumeMesh {
......
......@@ -49,7 +49,7 @@
#include "../Core/OpenVolumeMeshHandle.hh"
#include "OpenVolumeMeshStatus.hh"
#include "../Core/PropertyDefines.hh"
#include "../Config/Export.hh"
#include "OpenVolumeMesh/Config/Export.hh"
namespace OpenVolumeMesh {
......
......@@ -45,7 +45,7 @@
#include <vector>
#include "../Config/Export.hh"
#include "OpenVolumeMesh/Config/Export.hh"
#include "OpenVolumeMeshHandle.hh"
namespace OpenVolumeMesh {
......
......@@ -38,7 +38,7 @@
#include <string>
#include "OpenVolumeMeshHandle.hh"
#include "../Config/Export.hh"
#include "OpenVolumeMesh/Config/Export.hh"
namespace OpenVolumeMesh {
......
#pragma once
#include "../Config/Export.hh"
#include "OpenVolumeMesh/Config/Export.hh"
#include <type_traits>
namespace OpenVolumeMesh {
namespace Entity {
struct OVM_EXPORT Vertex {};
struct OVM_EXPORT Vertex { Vertex() = delete;};
struct OVM_EXPORT Edge {};
struct OVM_EXPORT HalfEdge {};
struct OVM_EXPORT Face {};
......
......@@ -52,7 +52,7 @@
#endif
#include "OpenVolumeMeshHandle.hh"
#include "../Config/Export.hh"
#include "OpenVolumeMesh/Config/Export.hh"
namespace OpenVolumeMesh {
......
......@@ -40,7 +40,7 @@
#include <vector>
#include "OpenVolumeMeshHandle.hh"
#include "../Config/Export.hh"
#include "OpenVolumeMesh/Config/Export.hh"
namespace OpenVolumeMesh {
......
......@@ -43,7 +43,7 @@
#include "Entities.hh"
#include "../System/FunctionalInclude.hh"
#include "../System/Deprecation.hh"
#include "../Config/Export.hh"
#include "OpenVolumeMesh/Config/Export.hh"
namespace OpenVolumeMesh {
......
......@@ -42,7 +42,7 @@
#include <type_traits>
#include "../System/Compiler.hh"
#include "../Config/Export.hh"
#include "OpenVolumeMesh/Config/Export.hh"
#include "OpenVolumeMeshProperty.hh"
#include "PropertyHandles.hh"
#include "TypeName.hh"
......
......@@ -52,7 +52,7 @@
#include <string>
#include <iterator>
#include "../Config/Export.hh"
#include "OpenVolumeMesh/Config/Export.hh"
namespace OpenVolumeMesh
{
......
......@@ -43,7 +43,7 @@
#include "OpenVolumeMeshHandle.hh"
#include "ResourceManager.hh"
#include "Iterators.hh"
#include "../Config/Export.hh"
#include "OpenVolumeMesh/Config/Export.hh"
namespace OpenVolumeMesh {
......
......@@ -47,7 +47,7 @@
#include <fstream>
#include <istream>
#include <ostream>
#include "../Config/Export.hh"
#include "OpenVolumeMesh/Config/Export.hh"
namespace OpenVolumeMesh {
......
......@@ -54,7 +54,7 @@
#include <cassert>
#include <cstdlib>
#include "../Config/Export.hh"
#include "OpenVolumeMesh/Config/Export.hh"
namespace OpenVolumeMesh {
......
......@@ -44,7 +44,7 @@
#define HEXAHEDRALMESHITERATORS_HH
#include "../Core/Iterators.hh"
#include "../Config/Export.hh"
#include "OpenVolumeMesh/Config/Export.hh"
namespace OpenVolumeMesh {
......
......@@ -42,7 +42,7 @@
#include "../Core/TopologyKernel.hh"
#include "HexahedralMeshIterators.hh"
#include "../Config/Export.hh"
#include "OpenVolumeMesh/Config/Export.hh"
namespace OpenVolumeMesh {
......
......@@ -44,7 +44,7 @@
#define TETRAHEDRALMESHITERATORS_HH
#include "../Core/Iterators.hh"
#include "../Config/Export.hh"
#include "OpenVolumeMesh/Config/Export.hh"
namespace OpenVolumeMesh {
......
......@@ -50,7 +50,7 @@
#include "../Core/TopologyKernel.hh"
#include "TetrahedralMeshIterators.hh"
#include "../Config/Export.hh"
#include "OpenVolumeMesh/Config/Export.hh"
namespace OpenVolumeMesh {
......
#include "../Config/Version.hh"
#include "OpenVolumeMesh/Config/Version.hh"
// C++ version at OVM build time,
// to be used for things that change ABI
......
#pragma once
#include "../Config/DeprecationConfig.hh"
#include "OpenVolumeMesh/Config/DeprecationConfig.hh"
#if defined(__cplusplus) && (__cplusplus >= 201402L)
# define OVM_DEPRECATED(msg) [[deprecated(msg)]]
......
Markdown is supported
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