25 lines
952 B
Diff
25 lines
952 B
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] 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
|