From 20bc437d54c044650b863c297de23906d96bede2 Mon Sep 17 00:00:00 2001
From: Gary Preston <gary@mups.co.uk>
Date: Wed, 17 Feb 2016 14:52:01 +0000
Subject: [PATCH] libxml include/lib related build errors for studio.

---
 code/studio/src/plugins/georges_editor/CMakeLists.txt      | 7 ++++---
 code/studio/src/plugins/gui_editor/widget_serializer.cpp   | 3 +++
 code/studio/src/plugins/world_editor/CMakeLists.txt        | 2 ++
 .../src/plugins/world_editor/world_editor_actions.cpp      | 4 ++++
 code/studio/src/plugins/world_editor/world_editor_misc.cpp | 3 +--
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/code/studio/src/plugins/georges_editor/CMakeLists.txt b/code/studio/src/plugins/georges_editor/CMakeLists.txt
index 68b37421d..216034fea 100644
--- a/code/studio/src/plugins/georges_editor/CMakeLists.txt
+++ b/code/studio/src/plugins/georges_editor/CMakeLists.txt
@@ -1,13 +1,14 @@
 INCLUDE_DIRECTORIES(  ${CMAKE_CURRENT_BINARY_DIR}
                       ${CMAKE_CURRENT_SOURCE_DIR}
                       ${QT_INCLUDES}
-					  ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/qtpropertybrowser)
+                      ${LIBXML2_INCLUDE_DIR}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/qtpropertybrowser)
 
 FILE(GLOB SRC *.cpp *.h)
 SET(OVQT_EXT_SYS_SRC  ${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin.h
                       ${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin_manager.h
                       ${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin_spec.h
-					  ${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin_spec.h)
+                      ${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin_spec.h)
 
 SET(OVQT_PLUG_GEORGES_EDITOR_HDR  georges_editor_plugin.h 
                                   georges_editor_form.h
@@ -49,7 +50,7 @@ SOURCE_GROUP("OVQT Extension System" FILES ${OVQT_EXT_SYS_SRC})
 
 ADD_LIBRARY(studio_plugin_georges_editor MODULE ${SRC} ${OVQT_PLUG_GEORGES_EDITOR_MOC_SRC} ${OVQT_EXT_SYS_SRC} ${OVQT_PLUG_GEORGES_EDITOR_UI_HDRS} ${OVQT_PLUGIN_GEORGES_EDITOR_RC_SRCS})
 
-TARGET_LINK_LIBRARIES(studio_plugin_georges_editor studio_plugin_core nelmisc nelgeorges qt_property_browser ${QT_LIBRARIES})
+TARGET_LINK_LIBRARIES(studio_plugin_georges_editor studio_plugin_core nelmisc nelgeorges qt_property_browser ${QT_LIBRARIES} ${LIBXML2_LIBRARIES})
 
 NL_DEFAULT_PROPS(studio_plugin_georges_editor "Tools: Studio Plugin: Georges Editor")
 NL_ADD_RUNTIME_FLAGS(studio_plugin_georges_editor)
diff --git a/code/studio/src/plugins/gui_editor/widget_serializer.cpp b/code/studio/src/plugins/gui_editor/widget_serializer.cpp
index 8006a6b50..a8594afed 100644
--- a/code/studio/src/plugins/gui_editor/widget_serializer.cpp
+++ b/code/studio/src/plugins/gui_editor/widget_serializer.cpp
@@ -19,6 +19,9 @@
 #include "nel/gui/interface_group.h"
 #include "nel/gui/widget_manager.h"
 
+#include <libxml/xmlstring.h>
+#include <libxml/tree.h>
+
 namespace GUIEditor
 {
 	bool WidgetSerializer::serialize( const std::string &masterGroup )
diff --git a/code/studio/src/plugins/world_editor/CMakeLists.txt b/code/studio/src/plugins/world_editor/CMakeLists.txt
index 1a7ff652d..b494f3f21 100644
--- a/code/studio/src/plugins/world_editor/CMakeLists.txt
+++ b/code/studio/src/plugins/world_editor/CMakeLists.txt
@@ -1,6 +1,7 @@
 INCLUDE_DIRECTORIES(	${CMAKE_CURRENT_BINARY_DIR}
 			${CMAKE_CURRENT_SOURCE_DIR}
 			${QT_INCLUDES}
+			${LIBXML2_INCLUDE_DIR}
 			${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/qtpropertybrowser
 			)
 
@@ -59,6 +60,7 @@ TARGET_LINK_LIBRARIES(	studio_plugin_world_editor
 						qt_property_browser
 						${QT_LIBRARIES} 
 						${QT_QTOPENGL_LIBRARY}
+						${LIBXML2_LIBRARIES}
 )
 
 NL_DEFAULT_PROPS(studio_plugin_world_editor "Tools: Studio Plugin: World Editor")
diff --git a/code/studio/src/plugins/world_editor/world_editor_actions.cpp b/code/studio/src/plugins/world_editor/world_editor_actions.cpp
index 5255e976f..a25cb5e18 100644
--- a/code/studio/src/plugins/world_editor/world_editor_actions.cpp
+++ b/code/studio/src/plugins/world_editor/world_editor_actions.cpp
@@ -41,6 +41,10 @@
 #include <QGraphicsView>
 #include <QPersistentModelIndex>
 
+// libxml
+#include <libxml/xmlstring.h>
+#include <libxml/tree.h>
+
 namespace WorldEditor
 {
 
diff --git a/code/studio/src/plugins/world_editor/world_editor_misc.cpp b/code/studio/src/plugins/world_editor/world_editor_misc.cpp
index a2736b1c5..2dd86df15 100644
--- a/code/studio/src/plugins/world_editor/world_editor_misc.cpp
+++ b/code/studio/src/plugins/world_editor/world_editor_misc.cpp
@@ -26,8 +26,7 @@
 #include <nel/ligo/primitive_utils.h>
 #include <nel/ligo/ligo_config.h>
 
-
-// Qt includes
+#include <libxml/tree.h>
 
 namespace WorldEditor
 {