Auto push constant blocks (#2764)

[platform/upstream/glslang.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ed5265..c318eef 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,9 @@ cmake_minimum_required(VERSION 2.8.12)
 if (POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
 endif()
+if(POLICY CMP0054)
+  cmake_policy(SET CMP0054 NEW)
+endif()
 
 project(glslang LANGUAGES CXX)
 
@@ -135,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)
@@ -194,8 +198,8 @@ elseif(MSVC)
     if(ENABLE_EXCEPTIONS)
         add_compile_options(/EHsc) # Enable Exceptions
        else()
-        string(REGEX REPLACE /EHsc "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Try to remove default /EHsc cxx_flag
-        add_compile_definitions(_HAS_EXCEPTIONS=0)
+        string(REGEX REPLACE "/EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # Try to remove default /EHsc cxx_flag
+        add_compile_options(/D_HAS_EXCEPTIONS=0)
     endif()
 endif()