diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-01-11 12:44:31 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-01-11 12:44:31 -0800 |
| commit | 57c78037a4a8f0f7384504475c5510984657f0d2 (patch) | |
| tree | 91928048e7001ea224d68da54d9bb43cbbd7970f /ports/openvdb | |
| parent | bf4a864a73dfe0f68a70598c9f5087beca57f2c7 (diff) | |
| parent | 1134de5eacf2052a936a943acea7f08ba06462d7 (diff) | |
| download | vcpkg-57c78037a4a8f0f7384504475c5510984657f0d2.tar.gz vcpkg-57c78037a4a8f0f7384504475c5510984657f0d2.zip | |
Merge branch 'master' into dev/philc/4990
Diffstat (limited to 'ports/openvdb')
| -rw-r--r-- | ports/openvdb/AddLinkageAndToolsChoice.patch | 8 | ||||
| -rw-r--r-- | ports/openvdb/CONTROL | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ports/openvdb/AddLinkageAndToolsChoice.patch b/ports/openvdb/AddLinkageAndToolsChoice.patch index 3d155cbe4..57078be15 100644 --- a/ports/openvdb/AddLinkageAndToolsChoice.patch +++ b/ports/openvdb/AddLinkageAndToolsChoice.patch @@ -73,7 +73,7 @@ index 5703eb9..6ff3c6a 100644 SET_SOURCE_FILES_PROPERTIES ( ${OPENVDB_LIBRARY_SOURCE_FILES} PROPERTIES - COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}" -+ COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} /bigobj" ++ COMPILE_FLAGS "-DOPENVDB_PRIVATE -DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$<CXX_COMPILER_ID:MSVC>:/bigobj>" ) - +IF ( OPENVDB_STATIC ) @@ -130,7 +130,7 @@ index 5703eb9..6ff3c6a 100644 SET_SOURCE_FILES_PROPERTIES ( ${VDB_PRINT_SOURCE_FILES} PROPERTIES - COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}" -+ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} /bigobj" ++ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$<CXX_COMPILER_ID:MSVC>:/bigobj>" ) +IF ( OPENVDB_BUILD_TOOLS ) @@ -142,7 +142,7 @@ index 5703eb9..6ff3c6a 100644 SET_SOURCE_FILES_PROPERTIES ( ${VDB_RENDER_SOURCE_FILES} PROPERTIES - COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG}" -+ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} /bigobj" ++ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} $<$<CXX_COMPILER_ID:MSVC>:/bigobj>" ) ADD_EXECUTABLE ( vdb_render ${VDB_RENDER_SOURCE_FILES} @@ -151,7 +151,7 @@ index 5703eb9..6ff3c6a 100644 SET_SOURCE_FILES_PROPERTIES ( ${VDB_VIEW_SOURCE_FILES} PROPERTIES - COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1" -+ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1 /bigobj" ++ COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1 $<$<CXX_COMPILER_ID:MSVC>:/bigobj>" ) -IF (NOT WIN32) ADD_EXECUTABLE ( vdb_view diff --git a/ports/openvdb/CONTROL b/ports/openvdb/CONTROL index 22c216b5c..e822bf04c 100644 --- a/ports/openvdb/CONTROL +++ b/ports/openvdb/CONTROL @@ -1,5 +1,5 @@ Source: openvdb -Version: 5.0.0-1 +Version: 5.0.0-2 Build-Depends: ilmbase, openexr, tbb, blosc, boost-iostreams, boost-system, boost-thread, boost-date-time, boost-any, boost-uuid, boost-interprocess Description: Sparse volume data structure and tools |