diff options
| author | Victor Romero <viromer@microsoft.com> | 2019-01-10 09:54:02 -0800 |
|---|---|---|
| committer | Victor Romero <viromer@microsoft.com> | 2019-01-10 09:54:02 -0800 |
| commit | f9732c27f1bf9aa127ed9b53d4bb20612a6fd0af (patch) | |
| tree | 652e6b64bb2e47ac124fd4b73e97cea2e92abbeb /ports/openvdb/AddLinkageAndToolsChoice.patch | |
| parent | 67ca08e9d3d0fb8097da84bc593a805f7169095f (diff) | |
| parent | 7578a485b181ded330b87cc72726f01e38ff7ed6 (diff) | |
| download | vcpkg-f9732c27f1bf9aa127ed9b53d4bb20612a6fd0af.tar.gz vcpkg-f9732c27f1bf9aa127ed9b53d4bb20612a6fd0af.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/viromer/5019
Diffstat (limited to 'ports/openvdb/AddLinkageAndToolsChoice.patch')
| -rw-r--r-- | ports/openvdb/AddLinkageAndToolsChoice.patch | 8 |
1 files changed, 4 insertions, 4 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 |