From 22d29b55a4fdd1c6bc5f5a13faaef5b8aaaf77ba Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Wed, 22 May 2019 14:19:24 -0700 Subject: [PATCH] Change include flag order Search the local src directories first. If using a system installed hsakmt, this would pick the installed hsa headers. Change-Id: I9746d6e9db1749a130e4d93e024556754a537083 --- runtime/hsa-runtime/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime/hsa-runtime/CMakeLists.txt b/runtime/hsa-runtime/CMakeLists.txt index ffe180f29d..2d815d66e5 100644 --- a/runtime/hsa-runtime/CMakeLists.txt +++ b/runtime/hsa-runtime/CMakeLists.txt @@ -92,16 +92,16 @@ get_filename_component ( HSAKMT_LIB_PATH ${HSAKMT_LIB} DIRECTORY CACHE ) unset( HSAKMT_INC CACHE ) unset( HSAKMT_LIB CACHE ) -## Set include and link directories for libhsakmt -include_directories ( ${HSAKMT_INC_PATH} ) -link_directories ( ${HSAKMT_LIB_PATH} ) - ## Set include directories for ROCr runtime include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} ) include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/inc ) include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/core/inc ) include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/libamdhsacode ) +## Set include and link directories for libhsakmt +include_directories ( ${HSAKMT_INC_PATH} ) +link_directories ( ${HSAKMT_LIB_PATH} ) + ## ROCr build internal versioning if ( DEFINED VERSION_BUILD ) add_definitions ( -DROCR_BUILD_ID=${BUILD_VERSION_STRING} )