commit | 50849374cb19559b1f85a0de1dc9b630cb1f4a07 | [log] [tgz] |
---|---|---|
author | Greg Fischer <greg@lunarg.com> | Fri Jul 30 16:12:21 2021 -0600 |
committer | GitHub <noreply@github.com> | Fri Jul 30 16:12:21 2021 -0600 |
tree | 417f1bd395e74d086f47d3ae74ee9b9bdefd6e75 | |
parent | c94ec9356f1a12876ae959409ec67eddb8a90c16 [diff] | |
parent | 27384e04f60add37a6da961d05caf4b6b7ec6b2a [diff] |
Merge pull request #2715 from greg-lunarg/i2714 Allow layout(std430) uniform with GL_EXT_scalar_block_layout
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0600516..2d29062 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -138,7 +138,8 @@ if(WIN32) set(CMAKE_DEBUG_POSTFIX "d") - if(MSVC) + option(OVERRIDE_MSVCCRT "Overrides runtime of MSVC " ON) + if(MSVC AND OVERRIDE_MSVCCRT) include(ChooseMSVCCRT.cmake) endif(MSVC) add_definitions(-DGLSLANG_OSINCLUDE_WIN32)