From 5009800a714954ef382324234c7c08bd6a8cb5df Mon Sep 17 00:00:00 2001
From: German Andryeyev <German.Andryeyev@amd.com>
Date: Thu, 13 Feb 2020 17:57:18 -0500
Subject: [PATCH] SWDEV-222307- Add CMake support for PAL

Use the new config file from VDI for the final link

Change-Id: Ia9dd284b630d82bb9c6fe54e5ddc2f493bd57152


[ROCm/clr commit: 723f0f4e4e4837ce0f6138948a6b177778dac88b]
---
 projects/clr/opencl/amdocl/CMakeLists.txt | 36 +++++++----------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/projects/clr/opencl/amdocl/CMakeLists.txt b/projects/clr/opencl/amdocl/CMakeLists.txt
index e55ef75eda..b2126b2110 100644
--- a/projects/clr/opencl/amdocl/CMakeLists.txt
+++ b/projects/clr/opencl/amdocl/CMakeLists.txt
@@ -13,21 +13,12 @@ set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
-find_package(ROCT REQUIRED)
-find_package(ROCR REQUIRED)
-
 add_definitions(-DLINUX -D__x86_64__ -D__AMD64__ -DUNIX_OS -DqLittleEndian -DOPENCL_MAJOR=2 -DOPENCL_MINOR=0 -DWITH_AQL -DWITH_ONLINE_COMPILER -DATI_OS_LINUX -DATI_ARCH_X86 -DLITTLEENDIAN_CPU -DATI_BITS_64 -DATI_COMP_GCC -DWITH_HSA_DEVICE -DWITH_TARGET_AMDGCN -DOPENCL_EXPORTS -DCL_USE_DEPRECATED_OPENCL_1_0_APIS -DCL_USE_DEPRECATED_OPENCL_1_1_APIS -DCL_USE_DEPRECATED_OPENCL_1_2_APIS -DCL_USE_DEPRECATED_OPENCL_2_0_APIS -DVEGA10_ONLY=false -DWITH_LIGHTNING_COMPILER)
 
 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 "")
-
 include_directories(${CMAKE_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/khronos)
 include_directories(${CMAKE_SOURCE_DIR}/khronos/headers)
@@ -44,18 +35,19 @@ if(${USE_COMGR_LIBRARY} MATCHES "yes")
    MESSAGE(STATUS "Code Object Manager found at ${amd_comgr_DIR}.")
 
   include_directories("$<TARGET_PROPERTY:amd_comgr,INTERFACE_INCLUDE_DIRECTORIES>")
-else()
-	#  include_directories(${CMAKE_SOURCE_DIR}/compiler/driver/src)
 endif()
 include_directories(${VDI_DIR})
 include_directories(${VDI_DIR}/include)
 include_directories(${VDI_DIR}/compiler/lib)
 include_directories(${VDI_DIR}/compiler/lib/include)
 include_directories(${VDI_DIR}/compiler/lib/backends/common)
-#include_directories(${VDI_DIR}/compiler/lib/loaders)
+
 include_directories(${VDI_DIR}/elf/utils/libelf)
 include_directories(${VDI_DIR}/elf/utils/common)
-#include_directories(${VDI_DIR}/compiler/tools)
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  add_compile_options("-Wno-ignored-attributes")
+endif()
 
 if(UNIX)
     set(ADDITIONAL_LIBRARIES glibc_functions.cpp)
@@ -89,23 +81,17 @@ add_library(amdocl64_obj OBJECT
   cl_context.cpp
   cl_profile_amd.cpp
   cl_p2p_amd.cpp
-  #  $<TARGET_OBJECTS:oclruntime>
-  #$<TARGET_OBJECTS:oclrocm>
   ${ADDITIONAL_LIBRARIES}
 )
 
 add_library(amdocl64 SHARED
-     $<TARGET_OBJECTS:amdocl64_obj>
-)
-add_library(amdocl64_static STATIC
-     $<TARGET_OBJECTS:amdocl64_obj>
+  $<TARGET_OBJECTS:amdocl64_obj>
 )
 
-add_library(amdvdi_static STATIC IMPORTED)
-set_target_properties(amdvdi_static PROPERTIES IMPORTED_LOCATION "${LIBVDI_STATIC_DIR}/libamdvdi_static.a")
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+find_package(Threads REQUIRED)
 
-#add_library(oclelf STATIC IMPORTED)
-#set_target_properties(oclelf PROPERTIES IMPORTED_LOCATION "${LIBOCLELF_STATIC_PATH}/liboclelf.a")
-target_link_libraries(amdocl64_static amdvdi_static pthread dl ${ROCT_LIBRARIES} ${ROCR_LIBRARIES})
+include(${LIBVDI_STATIC_DIR}/amdvdi_staticTargets.cmake)
+
+target_link_libraries(amdocl64 amdvdi_static Threads::Threads dl)
 
-target_link_libraries(amdocl64 amdvdi_static pthread dl ${ROCT_LIBRARIES} ${ROCR_LIBRARIES})