Bug #29691691: VS2019 FAILS TO COMPILE XCOM WHEN COMPILING WITH --DEBUG

Approved-by: Tor Didriksen <[email protected]>

/ZI turned to /Z7 exactly as /Zi is turned into /Z7.
This is to support VS2019 compilations.

Author: gkodinov

cmake/os/Windows.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2019, 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
@@ -87,6 +87,8 @@ IF(MSVC)
   #     information for use with the debugger. The symbolic debugging
   #     information includes the names and types of variables, as well as
   #     functions and line numbers. No .pdb file is produced by the compiler.
+  #     We can't use /ZI too since it's causing __LINE__ macros to be non-
+  #     constant on visual studio and hence XCom stops building correctly.
   FOREACH(lang C CXX)
     SET(CMAKE_${lang}_FLAGS_RELEASE "${CMAKE_${lang}_FLAGS_RELEASE} /Z7")
   ENDFOREACH()
@@ -99,6 +101,7 @@ IF(MSVC)
      STRING(REPLACE "/MD"  "/MT" "${flag}" "${${flag}}")
    ENDIF()
    STRING(REPLACE "/Zi"  "/Z7" "${flag}" "${${flag}}")
+   STRING(REPLACE "/ZI"  "/Z7" "${flag}" "${${flag}}")
    SET("${flag}" "${${flag}} /EHsc")
   ENDFOREACH()