Don't use include_directories for ROCR includes

Use the modern cmake, target specified method.

Change-Id: Icd7196bfccb85f255bbc01bc87c6667d961bb236


[ROCm/clr commit: 350d54e198]

projects/clr/rocclr/CMakeLists.txt

@@ -64,7 +64,6 @@ if(CMAKE_BUILD_TYPE MATCHES "^Debug$")
   add_definitions(-DDEBUG)
 endif()
 
-include_directories(${ROCR_INCLUDES})
 if (DEFINED LLVM_INCLUDES AND NOT ${LLVM_INCLUDES} STREQUAL "")
   include_directories(${LLVM_INCLUDES})
 endif() # if (DEFINED LLVM_INCLUDES AND NOT ${LLVM_INCLUDES} STREQUAL "")
@@ -136,7 +135,8 @@ add_library(oclruntime OBJECT
 )
 
 target_include_directories(oclruntime PUBLIC
-    $<TARGET_PROPERTY:amd_comgr,INTERFACE_INCLUDE_DIRECTORIES>)
+  $<TARGET_PROPERTY:amd_comgr,INTERFACE_INCLUDE_DIRECTORIES>
+  PRIVATE ${ROCR_INCLUDES} ${ROCT_INCLUDES})
 
 target_compile_definitions(oclruntime PRIVATE BSD_LIBELF)
 

projects/clr/rocclr/device/rocm/CMakeLists.txt

@@ -24,7 +24,8 @@ target_include_directories(oclrocm
     ${CMAKE_CURRENT_SOURCE_DIR}/compiler/lib/loaders/elf/utils/common
     ${CMAKE_CURRENT_SOURCE_DIR}/compiler/lib/loaders/elf/utils/libelf
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${ROCM_OCL_INCLUDES})
+    ${ROCM_OCL_INCLUDES}
+    ${ROCR_INCLUDES})
 
 
 # FIXME: Move this to config header.