commit | c94ec9356f1a12876ae959409ec67eddb8a90c16 | [log] [tgz] |
---|---|---|
author | Greg Fischer <greg@lunarg.com> | Fri Jul 30 12:03:27 2021 -0600 |
committer | GitHub <noreply@github.com> | Fri Jul 30 12:03:27 2021 -0600 |
tree | 9a6174df392a1feb6bee899e09a98a2b69c64200 | |
parent | 0db0010d3cff1dae00bc08389b6f2da03e309960 [diff] | |
parent | 0784c41300d1c66196788dbc0f216115304c68b5 [diff] |
Merge pull request #2690 from AndreyMlashkin/make_msvc_runtime_override_optional add possibility to not override runtime of MSVC
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)