Bug#25611359 REMOVE UNDOCUMENTED CMAKE OPTION WINDOWS_RUNTIME_MD

Remove the undocumented WINDOWS_RUNTIME_MD cmake option.
Remove /MT from compiler flags, and use default linkage, which is /MD

Author: Tor Didriksen

cmake/os/Windows.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -75,7 +75,6 @@ IF(MSVC)
   ENDFOREACH()
 
   # For release types Debug Release RelWithDebInfo (but not MinSizeRel):
-  # - Force static runtime libraries
   # - Choose C++ exception handling:
   #     If /EH is not specified, the compiler will catch structured and
   #     C++ exceptions, but will not destroy C++ objects that will go out of
@@ -98,20 +97,20 @@ IF(MSVC)
   FOREACH(lang C CXX)
     SET(CMAKE_${lang}_FLAGS_RELEASE "${CMAKE_${lang}_FLAGS_RELEASE} /Z7")
   ENDFOREACH()
-  IF(NOT WINDOWS_RUNTIME_MD)
+
     FOREACH(flag 
      CMAKE_C_FLAGS_RELEASE    CMAKE_C_FLAGS_RELWITHDEBINFO 
      CMAKE_C_FLAGS_DEBUG      CMAKE_C_FLAGS_DEBUG_INIT 
      CMAKE_CXX_FLAGS_RELEASE  CMAKE_CXX_FLAGS_RELWITHDEBINFO
      CMAKE_CXX_FLAGS_DEBUG    CMAKE_CXX_FLAGS_DEBUG_INIT)
-     STRING(REPLACE "/MD"  "/MT" "${flag}" "${${flag}}")
+#    Disable this substitution, use default, which is /MD
+#    STRING(REPLACE "/MD"  "/MT" "${flag}" "${${flag}}")
      STRING(REPLACE "/Zi"  "/Z7" "${flag}" "${${flag}}")
      IF (NOT WIN_DEBUG_NO_INLINE)
        STRING(REPLACE "/Ob0"  "/Ob1" "${flag}" "${${flag}}")
      ENDIF()
      SET("${flag}" "${${flag}} /EHsc")
     ENDFOREACH()
-  ENDIF()
 
   # Fix CMake's predefined huge stack size
   FOREACH(type EXE SHARED MODULE)

sql/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -320,9 +320,8 @@ ADD_COMPILE_FLAGS(
   COMPILE_FLAGS -DXXH_NAMESPACE=MY_
 )
 
-# Fixes "C1128: number of sections exceeded object file format limit" in MSVC /MD
-# The flag /bigobj is not added if the build is not WINDOWS_RUNTIME_MD (/MD)
-IF(WINDOWS_RUNTIME_MD AND CMAKE_SIZEOF_VOID_P MATCHES 8)
+# Fixes "C1128: number of sections exceeded object file format limit" in MSVC
+IF(WIN32 AND CMAKE_SIZEOF_VOID_P MATCHES 8)
   ADD_COMPILE_FLAGS(item_geofunc_setops.cc COMPILE_FLAGS "/bigobj")
 ENDIF()