From 22d19b963c89b109f2d4d5b67bf762b328f7a3af Mon Sep 17 00:00:00 2001 From: "andrei.malashkin" Date: Mon, 12 Jul 2021 20:08:15 +0400 Subject: [PATCH 1/3] add possibility to not override runtime of MSVC --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0600516e..6b8ebe06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,7 +138,8 @@ endif(ENABLE_GLSLANG_WEBMIN) 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) From fda1c58350273dd9c1d27430c10538dd0c97de87 Mon Sep 17 00:00:00 2001 From: "andrei.malashkin" Date: Wed, 14 Jul 2021 09:33:02 +0400 Subject: [PATCH 2/3] make AND to upper case --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b8ebe06..5fb6c958 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -139,7 +139,7 @@ endif(ENABLE_GLSLANG_WEBMIN) if(WIN32) set(CMAKE_DEBUG_POSTFIX "d") option(OVERRIDE_MSVCCRT "Overrides runtime of MSVC " ON) - if(MSVC and OVERRIDE_MSVCCRT) + if(MSVC AND OVERRIDE_MSVCCRT) include(ChooseMSVCCRT.cmake) endif(MSVC) add_definitions(-DGLSLANG_OSINCLUDE_WIN32) From 0784c41300d1c66196788dbc0f216115304c68b5 Mon Sep 17 00:00:00 2001 From: "andrei.malashkin" Date: Fri, 30 Jul 2021 09:12:45 +0200 Subject: [PATCH 3/3] correct ident --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fb6c958..2d290622 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,7 +138,7 @@ endif(ENABLE_GLSLANG_WEBMIN) if(WIN32) set(CMAKE_DEBUG_POSTFIX "d") - option(OVERRIDE_MSVCCRT "Overrides runtime of MSVC " ON) + option(OVERRIDE_MSVCCRT "Overrides runtime of MSVC " ON) if(MSVC AND OVERRIDE_MSVCCRT) include(ChooseMSVCCRT.cmake) endif(MSVC)