diff options
| author | Victor Romero Sanchez <viromer@microsoft.com> | 2019-01-08 15:51:24 -0800 |
|---|---|---|
| committer | Victor Romero Sanchez <viromer@microsoft.com> | 2019-01-08 15:51:24 -0800 |
| commit | 23a62a87fd8de3b870131761204db6d095a76121 (patch) | |
| tree | 4547c0cf92363677c8507073995436892298b5bd /ports/openvdb/AddLinkageAndToolsChoice.patch | |
| parent | 6f398da24938ac65b4a1ccee70e7196e1b790730 (diff) | |
| parent | 751db7b568c3bb94084d033fd82e5b6dcd443825 (diff) | |
| download | vcpkg-23a62a87fd8de3b870131761204db6d095a76121.tar.gz vcpkg-23a62a87fd8de3b870131761204db6d095a76121.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/viromer/5058
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 |