From 327e4c7e91820ed0b67711b4b6326c6fc14cf5a2 Mon Sep 17 00:00:00 2001 From: Mariusz Barczak Date: Tue, 16 Mar 2021 21:44:06 +0100 Subject: [PATCH] Allow to use BCC as a cmake sub-project Signed-off-by: Mariusz Barczak --- examples/cpp/CMakeLists.txt | 8 ++++---- introspection/CMakeLists.txt | 6 +++--- tests/cc/CMakeLists.txt | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt index 45b302802036..801e6badbb8a 100644 --- a/examples/cpp/CMakeLists.txt +++ b/examples/cpp/CMakeLists.txt @@ -1,10 +1,10 @@ # Copyright (c) Facebook, Inc. # Licensed under the Apache License, Version 2.0 (the "License") -include_directories(${CMAKE_BINARY_DIR}/src/cc) -include_directories(${CMAKE_SOURCE_DIR}/src/cc) -include_directories(${CMAKE_SOURCE_DIR}/src/cc/api) -include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi) +include_directories(${PROJECT_BINARY_DIR}/src/cc) +include_directories(${PROJECT_SOURCE_DIR}/src/cc) +include_directories(${PROJECT_SOURCE_DIR}/src/cc/api) +include_directories(${PROJECT_SOURCE_DIR}/src/cc/libbpf/include/uapi) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") diff --git a/introspection/CMakeLists.txt b/introspection/CMakeLists.txt index 6c83f0c890c3..dcbe69a3caad 100644 --- a/introspection/CMakeLists.txt +++ b/introspection/CMakeLists.txt @@ -1,9 +1,9 @@ # Copyright (c) Facebook, Inc. # Licensed under the Apache License, Version 2.0 (the "License") -include_directories(${CMAKE_SOURCE_DIR}/src/cc) -include_directories(${CMAKE_SOURCE_DIR}/src/cc/api) -include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi) +include_directories(${PROJECT_SOURCE_DIR}/src/cc) +include_directories(${PROJECT_SOURCE_DIR}/src/cc/api) +include_directories(${PROJECT_SOURCE_DIR}/src/cc/libbpf/include/uapi) option(INSTALL_INTROSPECTION "Install BPF introspection tools" ON) option(BPS_LINK_RT "Pass -lrt to linker when linking bps tool" ON) diff --git a/tests/cc/CMakeLists.txt b/tests/cc/CMakeLists.txt index 58493248c7b9..677867d7dad3 100644 --- a/tests/cc/CMakeLists.txt +++ b/tests/cc/CMakeLists.txt @@ -1,10 +1,10 @@ # Copyright (c) PLUMgrid, Inc. # Licensed under the Apache License, Version 2.0 (the "License") -include_directories(${CMAKE_SOURCE_DIR}/src/cc) -include_directories(${CMAKE_SOURCE_DIR}/src/cc/api) -include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi) -include_directories(${CMAKE_SOURCE_DIR}/tests/python/include) +include_directories(${PROJECT_SOURCE_DIR}/src/cc) +include_directories(${PROJECT_SOURCE_DIR}/src/cc/api) +include_directories(${PROJECT_SOURCE_DIR}/src/cc/libbpf/include/uapi) +include_directories(${PROJECT_SOURCE_DIR}/tests/python/include) add_executable(test_static test_static.c) if(NOT CMAKE_USE_LIBBPF_PACKAGE)