From e019d12f81fb8b6bf4b383c8f401d76e039d2c59 Mon Sep 17 00:00:00 2001 From: Payam Date: Fri, 14 Feb 2020 10:54:28 -0500 Subject: [PATCH] updated install to include header files from include dir and elf dir Change-Id: Ie7a8de6e5788de082703d806d0e5248bee9d1394 --- rocclr/CMakeLists.txt | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/rocclr/CMakeLists.txt b/rocclr/CMakeLists.txt index 3658142fa4..e22fa93345 100644 --- a/rocclr/CMakeLists.txt +++ b/rocclr/CMakeLists.txt @@ -33,20 +33,21 @@ find_library( OpenCL REQUIRED CONFIG /opt/rocm ) -find_path(OPENCL_INCLUDE_DIR - NAMES OpenCL/cl.h CL/cl.h - PATH_SUFFIXES include opencl/include inc include/x86_64 include/x64 - PATHS /opt/rocm - DOC "OpenCL include header OpenCL/cl.h or CL/cl.h" -) +if( NOT OPENCL_DIR ) + find_path(OPENCL_INCLUDE_DIR + NAMES OpenCL/cl.h CL/cl.h + PATH_SUFFIXES include opencl/include inc include/x86_64 include/x64 + PATHS /opt/rocm + DOC "OpenCL include header OpenCL/cl.h or CL/cl.h" + ) -if( NOT OPENCL_INCLUDE_DIR ) - unset(OPENCL_INCLUDE_DIR CACHE) - set(OPENCL_INCLUDE_DIR "" CACHE PATH "" FORCE ) -else() - set(OPENCL_ICD_LOADER_HEADERS_DIR "${OPENCL_INCLUDE_DIR}") + if( NOT OPENCL_INCLUDE_DIR ) + unset(OPENCL_INCLUDE_DIR CACHE) + set(OPENCL_INCLUDE_DIR "" CACHE PATH "" FORCE ) + endif() + MESSAGE(STATUS "Opencl found at ${OPENCL_INCLUDE_DIR}.") endif() - MESSAGE(STATUS "Opencl found at ${OPENCL_INCLUDE_DIR}.") + find_package(ROCT REQUIRED) @@ -192,6 +193,14 @@ FILE(GLOB headerfiles "${CMAKE_CURRENT_SOURCE_DIR}/*.h*") INSTALL ( FILES ${headerfiles} DESTINATION include) +INSTALL ( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include" + DESTINATION include + FILES_MATCHING PATTERN "*.h*") +INSTALL ( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/elf" + DESTINATION include + FILES_MATCHING PATTERN "*.h*") INSTALL ( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/compiler" DESTINATION include