From f3a891685cee873edd6c87bfbeee813080671866 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Wed, 21 Jun 2017 15:51:59 +0200
Subject: [PATCH] [App] DE: Full include path for VtkFbxConverter.
Remove VtkFbxConverter from include paths.
---
Applications/DataExplorer/CMakeLists.txt | 1 -
Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp | 5 ++---
Applications/DataExplorer/main.cpp | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/Applications/DataExplorer/CMakeLists.txt b/Applications/DataExplorer/CMakeLists.txt
index f9c99117144..b8488565723 100644
--- a/Applications/DataExplorer/CMakeLists.txt
+++ b/Applications/DataExplorer/CMakeLists.txt
@@ -9,7 +9,6 @@ endif()
if(VTKFBXCONVERTER_FOUND)
add_definitions(-DVTKFBXCONVERTER_FOUND)
- include_directories(${VTKFBXCONVERTER_INCLUDE_DIRS})
endif()
# Add subprojects
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp b/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp
index f50dfc2c120..9de591a2786 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp
@@ -35,10 +35,9 @@
#include <QMessageBox>
#ifdef VTKFBXCONVERTER_FOUND
-#include "ThirdParty/VtkFbxConverter/VtkFbxConverter.h"
-#include "Common.h"
#include <fbxsdk.h>
-
+#include "ThirdParty/VtkFbxConverter/Common.h"
+#include "ThirdParty/VtkFbxConverter/VtkFbxConverter.h"
extern FbxManager* lSdkManager;
extern FbxScene* lScene;
diff --git a/Applications/DataExplorer/main.cpp b/Applications/DataExplorer/main.cpp
index 2de9c234f62..1f6404aa23a 100644
--- a/Applications/DataExplorer/main.cpp
+++ b/Applications/DataExplorer/main.cpp
@@ -7,7 +7,7 @@
#include "LogogSimpleFormatter.h"
#ifdef VTKFBXCONVERTER_FOUND
#include <fbxsdk.h>
-#include "Common.h"
+#include "ThirdParty/VtkFbxConverter/Common.h"
FbxManager* lSdkManager = nullptr;
FbxScene* lScene = nullptr;
#endif
--
GitLab