From d2234d3ad48f92ee69d1af63baf0553caea8dbf5 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Wed, 23 Jan 2019 22:05:50 -0600 Subject: [PATCH 1/2] enabling PROF_API pkgconfig [ROCm/hip commit: 21f2ef94eec27d5affed5e88084a0c77f40240c0] --- projects/hip/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/hip/CMakeLists.txt b/projects/hip/CMakeLists.txt index 63772c893d..03d492a497 100644 --- a/projects/hip/CMakeLists.txt +++ b/projects/hip/CMakeLists.txt @@ -155,7 +155,12 @@ add_to_config(_buildInfo COMPILE_HIP_ATP_MARKER) ################ if(USE_PROF_API EQUAL 1) if(NOT DEFINED PROF_API_HEADER_PATH) - set(PROF_API_HEADER_PATH /opt/rocm/roctracer/include/ext) + if(PROF_API_PKG_CONFIG EQUAL 1) + find_package(PkgConfig) + pkg_get_variable(PROF_API_HEADER_PATH roctracer-proto prefix) + else() + set(PROF_API_HEADER_PATH /opt/rocm/roctracer/include/ext) + endif() endif() find_path(PROF_API_HEADER_DIR NAMES prof_protocol.h PATHS ${PROF_API_HEADER_PATH} NO_DEFAULT_PATH) if(NOT PROF_API_HEADER_DIR) From 323785067c953788a818bf6bce9c5c25c7e77a55 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Wed, 23 Jan 2019 23:40:35 -0600 Subject: [PATCH 2/2] PROF_API pkgconfig roctracer-proto module lookup [ROCm/hip commit: 81da8387224c04a78351a64848ba819b0ee9f671] --- projects/hip/CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/projects/hip/CMakeLists.txt b/projects/hip/CMakeLists.txt index 03d492a497..3db80f9e7e 100644 --- a/projects/hip/CMakeLists.txt +++ b/projects/hip/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.3) +cmake_minimum_required(VERSION 3.4.3) project(hip) ############################# @@ -155,11 +155,12 @@ add_to_config(_buildInfo COMPILE_HIP_ATP_MARKER) ################ if(USE_PROF_API EQUAL 1) if(NOT DEFINED PROF_API_HEADER_PATH) - if(PROF_API_PKG_CONFIG EQUAL 1) - find_package(PkgConfig) - pkg_get_variable(PROF_API_HEADER_PATH roctracer-proto prefix) + find_package(PkgConfig) + pkg_check_modules(ROCTRACERPROTO QUIET roctracer-proto) + if(ROCTRACERPROTO_FOUND EQUAL 1) + pkg_get_variable(PROF_API_HEADER_PATH roctracer-proto prefix) else() - set(PROF_API_HEADER_PATH /opt/rocm/roctracer/include/ext) + set(PROF_API_HEADER_PATH /opt/rocm/roctracer/include/ext) endif() endif() find_path(PROF_API_HEADER_DIR NAMES prof_protocol.h PATHS ${PROF_API_HEADER_PATH} NO_DEFAULT_PATH)