From a81ca4490fef9f5120fb16b86d8d5b1ca9287ff2 Mon Sep 17 00:00:00 2001
From: amzn-sj <srikkant@amazon.com>
Date: Thu, 15 Apr 2021 10:42:34 -0700
Subject: [PATCH 1/4] Move EMotionFX's OpenGL dependency to 3rd Party and make
 sure Mac builds successfully

---
 Gems/EMotionFX/Code/CMakeLists.txt            |  6 ------
 .../Editor/Platform/Mac/platform_mac.cmake    |  8 +------
 cmake/3rdParty/FindOpenGLInterface.cmake      | 21 +++++++++++++++++++
 .../Platform/Mac/OpenGLInterface_mac.cmake    | 16 ++++++++++++++
 .../Platform/Mac/cmake_mac_files.cmake        |  1 +
 cmake/3rdParty/cmake_files.cmake              |  1 +
 6 files changed, 40 insertions(+), 13 deletions(-)
 create mode 100644 cmake/3rdParty/FindOpenGLInterface.cmake
 create mode 100644 cmake/3rdParty/Platform/Mac/OpenGLInterface_mac.cmake

diff --git a/Gems/EMotionFX/Code/CMakeLists.txt b/Gems/EMotionFX/Code/CMakeLists.txt
index d46c67fafb..b90902a948 100644
--- a/Gems/EMotionFX/Code/CMakeLists.txt
+++ b/Gems/EMotionFX/Code/CMakeLists.txt
@@ -68,12 +68,6 @@ ly_add_target(
 )
 
 if (PAL_TRAIT_BUILD_HOST_TOOLS)
-
-    find_package(OpenGL QUIET REQUIRED)
-    # Imported targets (like OpenGL::GL) are scoped to a directory. Add a
-    # a global scope
-    add_library(3rdParty::OpenGLInterface INTERFACE IMPORTED GLOBAL)
-    target_link_libraries(3rdParty::OpenGLInterface INTERFACE OpenGL::GL)
     
     ly_add_target(
         NAME EMotionFX.Editor.Static STATIC
diff --git a/Gems/EMotionFX/Code/Editor/Platform/Mac/platform_mac.cmake b/Gems/EMotionFX/Code/Editor/Platform/Mac/platform_mac.cmake
index 821e7d1f25..95df062a93 100644
--- a/Gems/EMotionFX/Code/Editor/Platform/Mac/platform_mac.cmake
+++ b/Gems/EMotionFX/Code/Editor/Platform/Mac/platform_mac.cmake
@@ -13,10 +13,4 @@
 # based on the active platform
 # NOTE: functions in cmake are global, therefore adding functions to this file
 # is being avoided to prevent overriding functions declared in other targets platfrom
-# specific cmake files
-
-target_compile_definitions(3rdParty::OpenGLInterface
-    INTERFACE
-        # MacOS 10.14 deprecates OpenGL. This silences the warnings for now.
-        GL_SILENCE_DEPRECATION
-)
\ No newline at end of file
+# specific cmake files
\ No newline at end of file
diff --git a/cmake/3rdParty/FindOpenGLInterface.cmake b/cmake/3rdParty/FindOpenGLInterface.cmake
new file mode 100644
index 0000000000..7b537d1378
--- /dev/null
+++ b/cmake/3rdParty/FindOpenGLInterface.cmake
@@ -0,0 +1,21 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+find_package(OpenGL QUIET REQUIRED)
+# Imported targets (like OpenGL::GL) are scoped to a directory. Add a
+# a global scope
+add_library(3rdParty::OpenGLInterface INTERFACE IMPORTED GLOBAL)
+target_link_libraries(3rdParty::OpenGLInterface INTERFACE OpenGL::GL)
+
+set(pal_file ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME}/OpenGLInterface_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
+if(EXISTS ${pal_file})
+    include(${pal_file})
+endif()
\ No newline at end of file
diff --git a/cmake/3rdParty/Platform/Mac/OpenGLInterface_mac.cmake b/cmake/3rdParty/Platform/Mac/OpenGLInterface_mac.cmake
new file mode 100644
index 0000000000..c9a52f4b1b
--- /dev/null
+++ b/cmake/3rdParty/Platform/Mac/OpenGLInterface_mac.cmake
@@ -0,0 +1,16 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+target_compile_definitions(3rdParty::OpenGLInterface
+    INTERFACE
+        # MacOS 10.14 deprecates OpenGL. This silences the warnings for now.
+        GL_SILENCE_DEPRECATION
+)
\ No newline at end of file
diff --git a/cmake/3rdParty/Platform/Mac/cmake_mac_files.cmake b/cmake/3rdParty/Platform/Mac/cmake_mac_files.cmake
index f786f80cf7..0e3cc53262 100644
--- a/cmake/3rdParty/Platform/Mac/cmake_mac_files.cmake
+++ b/cmake/3rdParty/Platform/Mac/cmake_mac_files.cmake
@@ -15,6 +15,7 @@ set(FILES
     Clang_mac.cmake
     DirectXShaderCompiler_mac.cmake
     FbxSdk_mac.cmake
+    OpenGLInterface_mac.cmake
     OpenSSL_mac.cmake
     Wwise_mac.cmake
 )
diff --git a/cmake/3rdParty/cmake_files.cmake b/cmake/3rdParty/cmake_files.cmake
index 3fe15bc0ce..46b612df42 100644
--- a/cmake/3rdParty/cmake_files.cmake
+++ b/cmake/3rdParty/cmake_files.cmake
@@ -18,6 +18,7 @@ set(FILES
     Finddyad.cmake
     FindFbxSdk.cmake
     Findlibav.cmake
+    FindOpenGLInterface.cmake
     FindOpenSSL.cmake
     FindRadTelemetry.cmake
     FindVkValidation.cmake

From 7902eafd7d0c34b618cd1aa83b06aa7c87a49409 Mon Sep 17 00:00:00 2001
From: amzn-sj <srikkant@amazon.com>
Date: Thu, 15 Apr 2021 15:20:55 -0700
Subject: [PATCH 2/4] Add empty pal files for platforms other than Mac

---
 cmake/3rdParty/FindOpenGLInterface.cmake               |  4 +---
 .../Platform/Android/OpenGLInterface_android.cmake     | 10 ++++++++++
 .../Platform/Android/cmake_android_files.cmake         |  1 +
 .../Platform/Linux/OpenGLInterface_linux.cmake         | 10 ++++++++++
 cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake  |  1 +
 .../Platform/Windows/OpenGLInterface_windows.cmake     | 10 ++++++++++
 .../Platform/Windows/cmake_windows_files.cmake         |  1 +
 cmake/3rdParty/Platform/iOS/OpenGLInterface_ios.cmake  | 10 ++++++++++
 cmake/3rdParty/Platform/iOS/cmake_ios_files.cmake      |  1 +
 9 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 cmake/3rdParty/Platform/Android/OpenGLInterface_android.cmake
 create mode 100644 cmake/3rdParty/Platform/Linux/OpenGLInterface_linux.cmake
 create mode 100644 cmake/3rdParty/Platform/Windows/OpenGLInterface_windows.cmake
 create mode 100644 cmake/3rdParty/Platform/iOS/OpenGLInterface_ios.cmake

diff --git a/cmake/3rdParty/FindOpenGLInterface.cmake b/cmake/3rdParty/FindOpenGLInterface.cmake
index 7b537d1378..99bf19c4d7 100644
--- a/cmake/3rdParty/FindOpenGLInterface.cmake
+++ b/cmake/3rdParty/FindOpenGLInterface.cmake
@@ -16,6 +16,4 @@ add_library(3rdParty::OpenGLInterface INTERFACE IMPORTED GLOBAL)
 target_link_libraries(3rdParty::OpenGLInterface INTERFACE OpenGL::GL)
 
 set(pal_file ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME}/OpenGLInterface_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
-if(EXISTS ${pal_file})
-    include(${pal_file})
-endif()
\ No newline at end of file
+include(${pal_file})
\ No newline at end of file
diff --git a/cmake/3rdParty/Platform/Android/OpenGLInterface_android.cmake b/cmake/3rdParty/Platform/Android/OpenGLInterface_android.cmake
new file mode 100644
index 0000000000..4d5680a30d
--- /dev/null
+++ b/cmake/3rdParty/Platform/Android/OpenGLInterface_android.cmake
@@ -0,0 +1,10 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
diff --git a/cmake/3rdParty/Platform/Android/cmake_android_files.cmake b/cmake/3rdParty/Platform/Android/cmake_android_files.cmake
index 07e453f862..93d1f3386b 100644
--- a/cmake/3rdParty/Platform/Android/cmake_android_files.cmake
+++ b/cmake/3rdParty/Platform/Android/cmake_android_files.cmake
@@ -12,6 +12,7 @@
 set(FILES
     BuiltInPackages_android.cmake
     civetweb_android.cmake
+    OpenGLInterface_android.cmake
     VkValidation_android.cmake
     Wwise_android.cmake
 )
diff --git a/cmake/3rdParty/Platform/Linux/OpenGLInterface_linux.cmake b/cmake/3rdParty/Platform/Linux/OpenGLInterface_linux.cmake
new file mode 100644
index 0000000000..4d5680a30d
--- /dev/null
+++ b/cmake/3rdParty/Platform/Linux/OpenGLInterface_linux.cmake
@@ -0,0 +1,10 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
diff --git a/cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake b/cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake
index 2b1ba4d0e5..cce929b909 100644
--- a/cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake
+++ b/cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake
@@ -16,6 +16,7 @@ set(FILES
     Clang_linux.cmake
     dyad_linux.cmake
     FbxSdk_linux.cmake
+    OpenGLInterface_linux.cmake
     OpenSSL_linux.cmake
     Wwise_linux.cmake
 )
diff --git a/cmake/3rdParty/Platform/Windows/OpenGLInterface_windows.cmake b/cmake/3rdParty/Platform/Windows/OpenGLInterface_windows.cmake
new file mode 100644
index 0000000000..4d5680a30d
--- /dev/null
+++ b/cmake/3rdParty/Platform/Windows/OpenGLInterface_windows.cmake
@@ -0,0 +1,10 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
diff --git a/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake b/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake
index 2c7890fcc4..675ae7f695 100644
--- a/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake
+++ b/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake
@@ -18,6 +18,7 @@ set(FILES
     dyad_windows.cmake
     FbxSdk_windows.cmake
     libav_windows.cmake
+    OpenGLInterface_windows.cmake
     OpenSSL_windows.cmake
     Wwise_windows.cmake
 )
diff --git a/cmake/3rdParty/Platform/iOS/OpenGLInterface_ios.cmake b/cmake/3rdParty/Platform/iOS/OpenGLInterface_ios.cmake
new file mode 100644
index 0000000000..4d5680a30d
--- /dev/null
+++ b/cmake/3rdParty/Platform/iOS/OpenGLInterface_ios.cmake
@@ -0,0 +1,10 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
diff --git a/cmake/3rdParty/Platform/iOS/cmake_ios_files.cmake b/cmake/3rdParty/Platform/iOS/cmake_ios_files.cmake
index e32a9f75bb..242e1e91b0 100644
--- a/cmake/3rdParty/Platform/iOS/cmake_ios_files.cmake
+++ b/cmake/3rdParty/Platform/iOS/cmake_ios_files.cmake
@@ -11,6 +11,7 @@
 
 set(FILES
     BuiltInPackages_ios.cmake
+    OpenGLInterface_ios.cmake
     OpenSSL_ios.cmake
     RadTelemetry_ios.cmake
     Wwise_ios.cmake

From f76322d13d5916d7e38079050f234faa29036f2e Mon Sep 17 00:00:00 2001
From: amzn-sj <srikkant@amazon.com>
Date: Thu, 15 Apr 2021 15:59:30 -0700
Subject: [PATCH 3/4] Remove Android/iOS pal files since OpenGL is only needed
 by host tools.

---
 .../Platform/Android/OpenGLInterface_android.cmake     | 10 ----------
 .../Platform/Android/cmake_android_files.cmake         |  1 -
 cmake/3rdParty/Platform/iOS/OpenGLInterface_ios.cmake  | 10 ----------
 cmake/3rdParty/Platform/iOS/cmake_ios_files.cmake      |  1 -
 4 files changed, 22 deletions(-)
 delete mode 100644 cmake/3rdParty/Platform/Android/OpenGLInterface_android.cmake
 delete mode 100644 cmake/3rdParty/Platform/iOS/OpenGLInterface_ios.cmake

diff --git a/cmake/3rdParty/Platform/Android/OpenGLInterface_android.cmake b/cmake/3rdParty/Platform/Android/OpenGLInterface_android.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/cmake/3rdParty/Platform/Android/OpenGLInterface_android.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/cmake/3rdParty/Platform/Android/cmake_android_files.cmake b/cmake/3rdParty/Platform/Android/cmake_android_files.cmake
index 93d1f3386b..07e453f862 100644
--- a/cmake/3rdParty/Platform/Android/cmake_android_files.cmake
+++ b/cmake/3rdParty/Platform/Android/cmake_android_files.cmake
@@ -12,7 +12,6 @@
 set(FILES
     BuiltInPackages_android.cmake
     civetweb_android.cmake
-    OpenGLInterface_android.cmake
     VkValidation_android.cmake
     Wwise_android.cmake
 )
diff --git a/cmake/3rdParty/Platform/iOS/OpenGLInterface_ios.cmake b/cmake/3rdParty/Platform/iOS/OpenGLInterface_ios.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/cmake/3rdParty/Platform/iOS/OpenGLInterface_ios.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/cmake/3rdParty/Platform/iOS/cmake_ios_files.cmake b/cmake/3rdParty/Platform/iOS/cmake_ios_files.cmake
index 242e1e91b0..e32a9f75bb 100644
--- a/cmake/3rdParty/Platform/iOS/cmake_ios_files.cmake
+++ b/cmake/3rdParty/Platform/iOS/cmake_ios_files.cmake
@@ -11,7 +11,6 @@
 
 set(FILES
     BuiltInPackages_ios.cmake
-    OpenGLInterface_ios.cmake
     OpenSSL_ios.cmake
     RadTelemetry_ios.cmake
     Wwise_ios.cmake

From 73f275f479ad7ef48bd0f00291ecf1196eb241f8 Mon Sep 17 00:00:00 2001
From: amzn-sj <srikkant@amazon.com>
Date: Fri, 16 Apr 2021 15:37:26 -0700
Subject: [PATCH 4/4] Get FindOpenGLInterface to use ly_add_external_target()
 instead

---
 cmake/3rdParty.cmake                               |  4 ----
 cmake/3rdParty/FindOpenGLInterface.cmake           | 14 +++++++-------
 .../Platform/Linux/OpenGLInterface_linux.cmake     | 10 ----------
 .../Platform/Linux/cmake_linux_files.cmake         |  1 -
 .../Platform/Mac/OpenGLInterface_mac.cmake         |  7 ++-----
 .../Platform/Windows/OpenGLInterface_windows.cmake | 10 ----------
 .../Platform/Windows/cmake_windows_files.cmake     |  1 -
 7 files changed, 9 insertions(+), 38 deletions(-)
 delete mode 100644 cmake/3rdParty/Platform/Linux/OpenGLInterface_linux.cmake
 delete mode 100644 cmake/3rdParty/Platform/Windows/OpenGLInterface_windows.cmake

diff --git a/cmake/3rdParty.cmake b/cmake/3rdParty.cmake
index 4cd3ab2917..8d0c030302 100644
--- a/cmake/3rdParty.cmake
+++ b/cmake/3rdParty.cmake
@@ -116,10 +116,6 @@ function(ly_add_external_target)
         # Setting BASE_PATH variable in the parent scope to allow for the Find<3rdParty>.cmake scripts to use them
         set(BASE_PATH ${BASE_PATH} PARENT_SCOPE)
 
-        if(NOT EXISTS ${BASE_PATH})
-            message(FATAL_ERROR "Cannot find 3rdParty library ${ly_add_external_target_NAME} on path ${BASE_PATH}")
-        endif()
-
         add_library(3rdParty::${NAME_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)
 
         if(ly_add_external_target_INCLUDE_DIRECTORIES)
diff --git a/cmake/3rdParty/FindOpenGLInterface.cmake b/cmake/3rdParty/FindOpenGLInterface.cmake
index 99bf19c4d7..1e4992290f 100644
--- a/cmake/3rdParty/FindOpenGLInterface.cmake
+++ b/cmake/3rdParty/FindOpenGLInterface.cmake
@@ -9,11 +9,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
-find_package(OpenGL QUIET REQUIRED)
-# Imported targets (like OpenGL::GL) are scoped to a directory. Add a
-# a global scope
-add_library(3rdParty::OpenGLInterface INTERFACE IMPORTED GLOBAL)
-target_link_libraries(3rdParty::OpenGLInterface INTERFACE OpenGL::GL)
+find_package(OpenGL)
 
-set(pal_file ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME}/OpenGLInterface_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
-include(${pal_file})
\ No newline at end of file
+ly_add_external_target(
+    NAME OpenGLInterface
+    VERSION ""
+    BUILD_DEPENDENCIES
+        OpenGL::GL
+)
\ No newline at end of file
diff --git a/cmake/3rdParty/Platform/Linux/OpenGLInterface_linux.cmake b/cmake/3rdParty/Platform/Linux/OpenGLInterface_linux.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/cmake/3rdParty/Platform/Linux/OpenGLInterface_linux.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake b/cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake
index cce929b909..2b1ba4d0e5 100644
--- a/cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake
+++ b/cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake
@@ -16,7 +16,6 @@ set(FILES
     Clang_linux.cmake
     dyad_linux.cmake
     FbxSdk_linux.cmake
-    OpenGLInterface_linux.cmake
     OpenSSL_linux.cmake
     Wwise_linux.cmake
 )
diff --git a/cmake/3rdParty/Platform/Mac/OpenGLInterface_mac.cmake b/cmake/3rdParty/Platform/Mac/OpenGLInterface_mac.cmake
index c9a52f4b1b..7d0d47740f 100644
--- a/cmake/3rdParty/Platform/Mac/OpenGLInterface_mac.cmake
+++ b/cmake/3rdParty/Platform/Mac/OpenGLInterface_mac.cmake
@@ -9,8 +9,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
-target_compile_definitions(3rdParty::OpenGLInterface
-    INTERFACE
-        # MacOS 10.14 deprecates OpenGL. This silences the warnings for now.
-        GL_SILENCE_DEPRECATION
-)
\ No newline at end of file
+# MacOS 10.14 deprecates OpenGL. This silences the warnings for now.
+set(OPENGLINTERFACE_COMPILE_DEFINITIONS GL_SILENCE_DEPRECATION)
\ No newline at end of file
diff --git a/cmake/3rdParty/Platform/Windows/OpenGLInterface_windows.cmake b/cmake/3rdParty/Platform/Windows/OpenGLInterface_windows.cmake
deleted file mode 100644
index 4d5680a30d..0000000000
--- a/cmake/3rdParty/Platform/Windows/OpenGLInterface_windows.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
diff --git a/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake b/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake
index 675ae7f695..2c7890fcc4 100644
--- a/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake
+++ b/cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake
@@ -18,7 +18,6 @@ set(FILES
     dyad_windows.cmake
     FbxSdk_windows.cmake
     libav_windows.cmake
-    OpenGLInterface_windows.cmake
     OpenSSL_windows.cmake
     Wwise_windows.cmake
 )