3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 19:25:27 +08:00
Code Issues Projects Releases Wiki Activity

[Alembic]Fix error C1803 when using headers from OpenEXR (#6195)

Browse Source
This commit is contained in:
LarryIII 2019-04-24 11:19:54 -07:00 committed by Phil Christensen
parent f67b53df11
commit 9aa21f0670
3 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/alembic/CONTROL
View File

@ -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/

49
ports/alembic/fix-C1083.patch Normal file
View File

@ -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>

9
ports/alembic/portfile.cmake
View File

@ -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(