72 lines
2.2 KiB
Diff
72 lines
2.2 KiB
Diff
From f0220c1134a7f565cfd9e2a763d4e723adc0b211 Mon Sep 17 00:00:00 2001
|
|
From: Larry Gritz <lg@larrygritz.com>
|
|
Date: Wed, 3 Feb 2016 11:45:59 -0800
|
|
Subject: [PATCH 1/2] Suppress warning/error in pugi for gcc6
|
|
|
|
---
|
|
src/libOpenImageIO/CMakeLists.txt | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/src/libOpenImageIO/CMakeLists.txt b/src/libOpenImageIO/CMakeLists.txt
|
|
index 6994dfd..fd6e4d1 100644
|
|
--- a/src/libOpenImageIO/CMakeLists.txt
|
|
+++ b/src/libOpenImageIO/CMakeLists.txt
|
|
@@ -13,6 +13,10 @@ if (NOT USE_EXTERNAL_PUGIXML)
|
|
../include/OpenImageIO/pugixml.hpp
|
|
../include/OpenImageIO/pugixml.cpp
|
|
)
|
|
+ if (CMAKE_COMPILER_IS_GNUCC AND NOT ${GCC_VERSION} VERSION_LESS 6.0)
|
|
+ set_source_files_properties (formatspec.cpp xmp.cpp
|
|
+ PROPERTIES COMPILE_FLAGS -Wno-error=placement-new)
|
|
+ endif ()
|
|
endif()
|
|
|
|
set (libOpenImageIO_srcs deepdata.cpp exif.cpp formatspec.cpp imagebuf.cpp
|
|
|
|
From 9b476920b3764255eaef165bccf8a0bdca7d9775 Mon Sep 17 00:00:00 2001
|
|
From: Larry Gritz <lg@larrygritz.com>
|
|
Date: Wed, 3 Feb 2016 14:00:38 -0800
|
|
Subject: [PATCH 2/2] Fix location of pugixml.hpp when using external one
|
|
|
|
---
|
|
src/libOpenImageIO/formatspec.cpp | 6 +++++-
|
|
src/libOpenImageIO/xmp.cpp | 7 ++++++-
|
|
2 files changed, 11 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/libOpenImageIO/formatspec.cpp b/src/libOpenImageIO/formatspec.cpp
|
|
index 5abd289..6a4e31f 100644
|
|
--- a/src/libOpenImageIO/formatspec.cpp
|
|
+++ b/src/libOpenImageIO/formatspec.cpp
|
|
@@ -42,8 +42,12 @@
|
|
#include "OpenImageIO/fmath.h"
|
|
#include "OpenImageIO/imageio.h"
|
|
#include "imageio_pvt.h"
|
|
-#include "OpenImageIO/pugixml.hpp"
|
|
|
|
+#if USE_EXTERNAL_PUGIXML
|
|
+# include "pugixml.hpp"
|
|
+#else
|
|
+# include "OpenImageIO/pugixml.hpp"
|
|
+#endif
|
|
|
|
OIIO_NAMESPACE_BEGIN
|
|
|
|
diff --git a/src/libOpenImageIO/xmp.cpp b/src/libOpenImageIO/xmp.cpp
|
|
index e2b16d4..9a5c985 100644
|
|
--- a/src/libOpenImageIO/xmp.cpp
|
|
+++ b/src/libOpenImageIO/xmp.cpp
|
|
@@ -37,7 +37,12 @@
|
|
#include "OpenImageIO/strutil.h"
|
|
#include "OpenImageIO/fmath.h"
|
|
#include "OpenImageIO/imageio.h"
|
|
-#include "OpenImageIO/pugixml.hpp"
|
|
+
|
|
+#if USE_EXTERNAL_PUGIXML
|
|
+# include "pugixml.hpp"
|
|
+#else
|
|
+# include "OpenImageIO/pugixml.hpp"
|
|
+#endif
|
|
|
|
#define DEBUG_XMP_READ 0
|
|
#define DEBUG_XMP_WRITE 0
|