diff --git a/rocclr/cmake/ROCclr.cmake b/rocclr/cmake/ROCclr.cmake
index 0eebda08ad..fd09d38b1c 100644
--- a/rocclr/cmake/ROCclr.cmake
+++ b/rocclr/cmake/ROCclr.cmake
@@ -42,6 +42,8 @@ find_package(AMD_OPENCL)
 
 add_library(rocclr STATIC)
 
+include(ROCclrCompilerOptions)
+
 set(ROCCLR_SRC_DIR "${CMAKE_CURRENT_LIST_DIR}/..")
 mark_as_advanced(ROCCLR_SRC_DIR)
 
diff --git a/rocclr/cmake/ROCclrCompilerOptions.cmake b/rocclr/cmake/ROCclrCompilerOptions.cmake
new file mode 100644
index 0000000000..2dae3dab0d
--- /dev/null
+++ b/rocclr/cmake/ROCclrCompilerOptions.cmake
@@ -0,0 +1,31 @@
+# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+include_guard()
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+  if (CMAKE_VERSION VERSION_LESS "3.20")
+    # This code is neccessary to avoid this command line warning:
+    # "Overriding /GR with /GR- cl: command line warning D9025"
+    #
+    # /GR is implied by MSVC anyway. So getting rid of it doesn't matter.
+    string(REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+  endif()
+endif()