The proposed mechanism to data pugixml does not work under Windows.

Alzathar · Alzathar · commit 0cd565a974a5 · 2017-03-13T17:03:39.000-04:00
diff --git a/3rdparty/pugixml/CMakeLists.txt b/3rdparty/pugixml/CMakeLists.txt
@@ -7,8 +7,8 @@ SET(PUGIXML_SRCS
 ADD_LIBRARY(pugixml SHARED ${PUGIXML_SRCS})
 
 TARGET_INCLUDE_DIRECTORIES(pugixml PUBLIC
-  $<BUILD_INTERFACE:${OPENMA_BINARY_DIR}/include>
-  $<BUILD_INTERFACE:${OPENMA_SOURCE_DIR}/3rdparty/pugixml/include>
+  $<BUILD_INTERFACE:${OPENMA_BINARY_DIR}/3rdparty/pugixml>
+  $<BUILD_INTERFACE:${OPENMA_SOURCE_DIR}/3rdparty/pugixml/src>
 )
 
 GENERATE_EXPORT_HEADER(pugixml
diff --git a/3rdparty/pugixml/README.OPENMA b/3rdparty/pugixml/README.OPENMA
@@ -1 +1,3 @@
-The folder 'include' is an addition to simplify the inclusion of PugiXML in OpenMA.
+In case the library pugixml is updated, it is important to patch the file src/pugiconfig.hpp around the line 17 with the following code:
+
+#include "pugixml_export.h"
diff --git a/3rdparty/pugixml/include/pugixml/pugixml.h b/3rdparty/pugixml/include/pugixml/pugixml.h
diff --git a/3rdparty/pugixml/src/pugiconfig.hpp b/3rdparty/pugixml/src/pugiconfig.hpp
@@ -14,6 +14,8 @@
 #ifndef HEADER_PUGICONFIG_HPP
 #define HEADER_PUGICONFIG_HPP
 
+#include "pugixml_export.h"
+
 // Uncomment this to enable wchar_t mode
 // #define PUGIXML_WCHAR_MODE
 
diff --git a/modules/io/plugins/trialformats/hpf/hpfhandler.cpp b/modules/io/plugins/trialformats/hpf/hpfhandler.cpp
@@ -52,7 +52,7 @@
 #include <cmath>
 
 
-#include <pugixml/pugixml.h>
+#include <pugixml.hpp>
 
 // -------------------------------------------------------------------------- //
 //                                 PRIVATE API                                //

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ SET(PUGIXML_SRCS`
`7`	`7`	`ADD_LIBRARY(pugixml SHARED ${PUGIXML_SRCS})`
`8`	`8`
`9`	`9`	`TARGET_INCLUDE_DIRECTORIES(pugixml PUBLIC`
`10`		`- $<BUILD_INTERFACE:${OPENMA_BINARY_DIR}/include>`
`11`		`- $<BUILD_INTERFACE:${OPENMA_SOURCE_DIR}/3rdparty/pugixml/include>`
	`10`	`+ $<BUILD_INTERFACE:${OPENMA_BINARY_DIR}/3rdparty/pugixml>`
	`11`	`+ $<BUILD_INTERFACE:${OPENMA_SOURCE_DIR}/3rdparty/pugixml/src>`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`GENERATE_EXPORT_HEADER(pugixml`