Merge pull request #885 from eshcherb/roctracer-hip-frontend-190129

roctracer-proto pkg-config fix to includedir

[ROCm/hip commit: b0e4451306]
Tento commit je obsažen v:
Maneesh Gupta
2019-01-30 13:00:45 +05:30
odevzdal GitHub
2 změnil soubory, kde provedl 3 přidání a 3 odebrání
+1 -1
Zobrazit soubor
@@ -158,7 +158,7 @@ if(USE_PROF_API EQUAL 1)
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)
pkg_get_variable(PROF_API_HEADER_PATH roctracer-proto includedir)
else()
set(PROF_API_HEADER_PATH /opt/rocm/roctracer/include/ext)
endif()
+2 -2
Zobrazit soubor
@@ -195,8 +195,8 @@ class api_callbacks_table_t {
public:
typedef void* act_t;
typedef void* fun_t;
bool set_activity(uint32_t id, act_t fun, void* arg) { return true; }
bool set_callback(uint32_t id, fun_t fun, void* arg) { return true; }
bool set_activity(uint32_t id, act_t fun, void* arg) { return false; }
bool set_callback(uint32_t id, fun_t fun, void* arg) { return false; }
};
#endif