diff options
| author | LarryIII <33021067+LarryIII@users.noreply.github.com> | 2019-04-24 11:19:54 -0700 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-04-24 11:19:54 -0700 |
| commit | 9aa21f0670b62d6e109ede31251c3e3952f556f1 (patch) | |
| tree | 1dc054d255dbb9d844f29c0653f33ba9a54c69e0 | |
| parent | f67b53df119e8fb4e9bbf06a8e1dfb48040e9f85 (diff) | |
| download | vcpkg-9aa21f0670b62d6e109ede31251c3e3952f556f1.tar.gz vcpkg-9aa21f0670b62d6e109ede31251c3e3952f556f1.zip | |
[Alembic]Fix error C1803 when using headers from OpenEXR (#6195)
| -rw-r--r-- | ports/alembic/CONTROL | 2 | ||||
| -rw-r--r-- | ports/alembic/fix-C1083.patch | 49 | ||||
| -rw-r--r-- | ports/alembic/portfile.cmake | 9 |
3 files changed, 53 insertions, 7 deletions
diff --git a/ports/alembic/CONTROL b/ports/alembic/CONTROL index 59a6580ba..5e3f2befb 100644 --- a/ports/alembic/CONTROL +++ b/ports/alembic/CONTROL @@ -1,4 +1,4 @@ Source: alembic -Version: 1.7.10 +Version: 1.7.10-1 Build-Depends: ilmbase, hdf5 Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications. http://alembic.io/ diff --git a/ports/alembic/fix-C1083.patch b/ports/alembic/fix-C1083.patch new file mode 100644 index 000000000..15de9f514 --- /dev/null +++ b/ports/alembic/fix-C1083.patch @@ -0,0 +1,49 @@ +diff --git a/lib/Alembic/Abc/Foundation.h b/lib/Alembic/Abc/Foundation.h
+index 9760c49..fbab6a0 100644
+--- a/lib/Alembic/Abc/Foundation.h
++++ b/lib/Alembic/Abc/Foundation.h
+@@ -40,11 +40,11 @@
+ #include <Alembic/AbcCoreAbstract/All.h>
+ #include <Alembic/Util/All.h>
+
+-#include <ImathVec.h>
+-#include <ImathBox.h>
+-#include <ImathMatrix.h>
+-#include <ImathQuat.h>
+-#include <ImathColor.h>
++#include <OpenEXR/ImathVec.h>
++#include <OpenEXR/ImathBox.h>
++#include <OpenEXR/ImathMatrix.h>
++#include <OpenEXR/ImathQuat.h>
++#include <OpenEXR/ImathColor.h>
+
+ #include <iostream>
+ #include <string>
+diff --git a/lib/Alembic/AbcGeom/Foundation.h b/lib/Alembic/AbcGeom/Foundation.h
+index 301efc3..2bb0f6b 100644
+--- a/lib/Alembic/AbcGeom/Foundation.h
++++ b/lib/Alembic/AbcGeom/Foundation.h
+@@ -39,8 +39,8 @@
+
+ #include <Alembic/Abc/All.h>
+
+-#include <ImathMatrixAlgo.h>
+-#include <ImathEuler.h>
++#include <OpenEXR/ImathMatrixAlgo.h>
++#include <OpenEXR/ImathEuler.h>
+
+
+ namespace Alembic {
+diff --git a/lib/Alembic/Util/Foundation.h b/lib/Alembic/Util/Foundation.h
+index d7f40dd..a41bb97 100644
+--- a/lib/Alembic/Util/Foundation.h
++++ b/lib/Alembic/Util/Foundation.h
+@@ -63,7 +63,7 @@
+
+ #include <memory>
+
+-#include <half.h>
++#include <OpenEXR/half.h>
+
+ #include <iomanip>
+ #include <iostream>
diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake index 1f01136b3..33bb760c8 100644 --- a/ports/alembic/portfile.cmake +++ b/ports/alembic/portfile.cmake @@ -18,13 +18,10 @@ vcpkg_from_github( REF 1.7.10 SHA512 e98ffaedb98dbc5c53fe9703d3063bb118d32c83c47e3af04c8fc96237034b02fe0fc2c628ca82bdd0e0ef17d9375f4f48e0022ce33380b9ad91970539611ced HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/fix-hdf5link.patch - ${CMAKE_CURRENT_LIST_DIR}/bypass-findhdf5.patch + fix-hdf5link.patch + bypass-findhdf5.patch + fix-C1083.patch ) vcpkg_configure_cmake( |