From 4608c6a397fe86162d29de67b50deefa2c7a7ac3 Mon Sep 17 00:00:00 2001
From: Philippe Virouleau <philippe.44@gmail.com>
Date: Wed, 25 Sep 2019 11:18:31 +0200
Subject: [PATCH] only include papi if found
---
tracelib/CMakeLists.txt | 10 ++++++++--
tracelib/kaapi_trace_lib.c | 6 ++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/tracelib/CMakeLists.txt b/tracelib/CMakeLists.txt
index 32f3ba2..cb32ab2 100644
--- a/tracelib/CMakeLists.txt
+++ b/tracelib/CMakeLists.txt
@@ -18,8 +18,14 @@ else()
add_compile_options("-DKAAPI_USE_PAPI=0")
endif()
-include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${PAPI_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_library(tracelib SHARED kaapi_recorder.c kaapi_rt.c kaapi_trace_lib.c kaapi_hashmap.c kaapi_trace_rt.c kaapi_parser.c ${CMAKE_CURRENT_BINARY_DIR}/git_hash.h ${CMAKE_CURRENT_BINARY_DIR}/hw_count.h)
-target_link_libraries(tracelib Threads::Threads ${PAPI_LIBRARIES})
+target_link_libraries(tracelib Threads::Threads)
+
+if (${PAPI_FOUND})
+ include_directories(${PAPI_INCLUDE_DIRS})
+ target_link_libraries(tracelib ${PAPI_LIBRARIES})
+endif()
+
install(TARGETS tracelib DESTINATION lib)
diff --git a/tracelib/kaapi_trace_lib.c b/tracelib/kaapi_trace_lib.c
index 07892ca..e552489 100644
--- a/tracelib/kaapi_trace_lib.c
+++ b/tracelib/kaapi_trace_lib.c
@@ -2016,6 +2016,7 @@ static int kaapi_get_events(
return -1;
+#if KAAPI_USE_PAPI
/* Register PAPI counter to be at KAAPI_PERF_ID_PAPI_BASE+cnt in kaapi_perfctr_info
*/
if (type == KAAPI_PCTR_PAPI)
@@ -2052,8 +2053,9 @@ static int kaapi_get_events(
}
break;
}
- }
- else if (type == KAAPI_PCTR_LIBRARY)
+ } else
+#endif
+ if (type == KAAPI_PCTR_LIBRARY)
{
if (event_code <KAAPI_PERF_ID_MAX)
{
--
GitLab