From 3624b8df16b39e2871cdd8c2ecd4e22b81ad6e30 Mon Sep 17 00:00:00 2001
From: Matt Arsenault <Matthew.Arsenault@amd.com>
Date: Thu, 14 May 2020 10:34:47 -0400
Subject: [PATCH] Fix missing target includes for GL/EGL headers

Change-Id: I9a31eae40cb7187dd0264ad5b9577fab96464b41
---
 rocclr/CMakeLists.txt             | 2 ++
 rocclr/device/pal/CMakeLists.txt  | 4 +++-
 rocclr/device/rocm/CMakeLists.txt | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/rocclr/CMakeLists.txt b/rocclr/CMakeLists.txt
index aab9891ce1..4c23dcb1b4 100644
--- a/rocclr/CMakeLists.txt
+++ b/rocclr/CMakeLists.txt
@@ -141,6 +141,8 @@ target_include_directories(amdrocclr_static
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/elf/utils/common>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/elf/utils/libelf>
     $<BUILD_INTERFACE:${OPENCL_DIR}>
+    # GL and EGL headers.
+    $<BUILD_INTERFACE:${OPENCL_DIR}/khronos/headers>
     $<BUILD_INTERFACE:${OPENCL_DIR}/khronos/headers/opencl2.2>
     $<TARGET_PROPERTY:amd_comgr,INTERFACE_INCLUDE_DIRECTORIES>
   PRIVATE
diff --git a/rocclr/device/pal/CMakeLists.txt b/rocclr/device/pal/CMakeLists.txt
index 1f50b7baba..682fc80e57 100644
--- a/rocclr/device/pal/CMakeLists.txt
+++ b/rocclr/device/pal/CMakeLists.txt
@@ -100,10 +100,12 @@ target_include_directories(rocclrpal
     $<INSTALL_INTERFACE:include>
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+    # GL and EGL headers
+    $<BUILD_INTERFACE:${OPENCL_DIR}/khronos/headers>
+    $<BUILD_INTERFACE:${OPENCL_DIR}/khronos/headers/opencl2.2>
     $<TARGET_PROPERTY:amd_comgr,INTERFACE_INCLUDE_DIRECTORIES>
   PRIVATE
     ${OPENCL_DIR}
-    ${OPENCL_DIR}/khronos/headers/opencl2.2
     ${PROJECT_SOURCE_DIR}/compiler/lib
     ${PROJECT_SOURCE_DIR}/compiler/lib/include
     ${PROJECT_SOURCE_DIR}/compiler/lib/backends/common
diff --git a/rocclr/device/rocm/CMakeLists.txt b/rocclr/device/rocm/CMakeLists.txt
index 19f66606d6..fe63dbd2f3 100644
--- a/rocclr/device/rocm/CMakeLists.txt
+++ b/rocclr/device/rocm/CMakeLists.txt
@@ -21,10 +21,12 @@ target_include_directories(oclrocm
     $<INSTALL_INTERFACE:include>
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+    # GL and EGL headers
+    $<BUILD_INTERFACE:${OPENCL_DIR}/khronos/headers>
+    $<BUILD_INTERFACE:${OPENCL_DIR}/khronos/headers/opencl2.2>
     $<TARGET_PROPERTY:amd_comgr,INTERFACE_INCLUDE_DIRECTORIES>
   PRIVATE
     ${OPENCL_DIR}
-    ${OPENCL_DIR}/khronos/headers/opencl2.2
     ${PROJECT_SOURCE_DIR}/compiler/lib
     ${PROJECT_SOURCE_DIR}/compiler/lib/include
     ${PROJECT_SOURCE_DIR}/compiler/lib/backends/common