cmake: Add default include directories

There's a lot of duplication in how we handle include directories. Since
basically all targets will include rooted from the same two directories,
just set them project wide and save ourselves the duplication.

Author: danobi

CMakeLists.txt

@@ -55,6 +55,9 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
   add_compile_options("-Wno-narrowing")
 endif()
 
+include_directories(${CMAKE_SOURCE_DIR}/src)
+include_directories(${CMAKE_BINARY_DIR})
+
 # Ninja buffers output so gcc/clang think it's not an interactive session.
 # Colors are useful for compiler errors so force the color
 if("${CMAKE_GENERATOR}" STREQUAL "Ninja")
@@ -112,7 +115,7 @@ flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc)
 add_flex_bison_dependency(flex_lexer bison_parser)
 add_library(parser STATIC ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
 target_compile_options(parser PRIVATE "-w")
-target_include_directories(parser PRIVATE src src/ast ${CMAKE_BINARY_DIR})
+target_include_directories(parser PRIVATE src src/ast)
 
 include(CheckSymbolExists)
 set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)

src/CMakeLists.txt

@@ -58,14 +58,10 @@ add_library(libbpftrace STATIC
 )
 # So it's not "liblibbpftrace"
 set_target_properties(libbpftrace PROPERTIES PREFIX "")
-target_include_directories(libbpftrace PRIVATE ${CMAKE_SOURCE_DIR}/src)
-target_include_directories(libbpftrace PRIVATE ${CMAKE_BINARY_DIR})
 
 add_executable(${BPFTRACE}
   ${MAIN_SRC}
 )
-target_include_directories(${BPFTRACE} PRIVATE ${CMAKE_SOURCE_DIR}/src)
-target_include_directories(${BPFTRACE} PRIVATE ${CMAKE_BINARY_DIR})
 
 install(TARGETS ${BPFTRACE} DESTINATION ${CMAKE_INSTALL_BINDIR})
 target_link_libraries(${BPFTRACE} libbpftrace)
@@ -116,11 +112,7 @@ add_custom_target(version_h
 add_dependencies(${BPFTRACE} version_h)
 add_dependencies(libbpftrace version_h)
 
-target_include_directories(required_resources PRIVATE ${CMAKE_BINARY_DIR})
-target_include_directories(required_resources PRIVATE ${CMAKE_SOURCE_DIR}/src)
 target_compile_definitions(required_resources PRIVATE ${BPFTRACE_FLAGS})
-target_include_directories(runtime PRIVATE ${CMAKE_BINARY_DIR})
-target_include_directories(runtime PRIVATE ${CMAKE_SOURCE_DIR}/src)
 target_compile_definitions(runtime PRIVATE ${BPFTRACE_FLAGS})
 target_include_directories(libbpftrace PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 target_compile_definitions(libbpftrace PRIVATE ${BPFTRACE_FLAGS})

src/aot/CMakeLists.txt

@@ -1,8 +1,6 @@
 add_library(aot STATIC aot.cpp)
-add_dependencies(aot parser version_h)
-target_link_libraries(aot required_resources)
-target_include_directories(aot PRIVATE ${CMAKE_SOURCE_DIR}/src)
-target_include_directories(aot PRIVATE ${CMAKE_BINARY_DIR})
+add_dependencies(aot version_h)
+target_link_libraries(aot required_resources parser)
 target_compile_definitions(aot PRIVATE ${BPFTRACE_FLAGS})
 
 if(STATIC_LINKING)
@@ -18,8 +16,6 @@ if(NOT LIBBCC_BPF_CONTAINS_RUNTIME)
 endif()
 
 add_executable(bpftrace-aotrt aot_main.cpp)
-target_include_directories(bpftrace-aotrt PRIVATE ${CMAKE_SOURCE_DIR}/src)
-target_include_directories(bpftrace-aotrt PRIVATE ${CMAKE_BINARY_DIR})
 target_link_libraries(bpftrace-aotrt aot runtime arch ast ast_defs cxxdemangler_stdlib)
 install(TARGETS bpftrace-aotrt DESTINATION ${CMAKE_INSTALL_BINDIR})
 

src/arch/CMakeLists.txt

@@ -17,5 +17,3 @@ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "loongarch64")
 else()
   message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}")
 endif()
-
-target_include_directories(arch PRIVATE ${CMAKE_SOURCE_DIR}/src)

src/ast/CMakeLists.txt

@@ -1,6 +1,4 @@
 add_library(ast_defs STATIC ast.cpp)
-target_include_directories(ast_defs PRIVATE ${CMAKE_SOURCE_DIR}/src)
-target_include_directories(ast_defs PRIVATE ${CMAKE_BINARY_DIR})
 add_dependencies(ast_defs parser)
 
 add_library(ast STATIC
@@ -25,8 +23,6 @@ add_library(ast STATIC
   passes/return_path_analyser.cpp
 )
 
-target_include_directories(ast PRIVATE ${CMAKE_SOURCE_DIR}/src)
-target_include_directories(ast PRIVATE ${CMAKE_BINARY_DIR})
 target_compile_definitions(ast PRIVATE ${BPFTRACE_FLAGS})
 target_link_libraries(ast ast_defs arch parser)
 

tests/CMakeLists.txt

@@ -65,8 +65,6 @@ target_include_directories(bpftrace_test PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 target_include_directories(bpftrace_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_compile_definitions(bpftrace_test PRIVATE TEST_CODEGEN_LOCATION="${CMAKE_SOURCE_DIR}/tests/codegen/llvm/")
-target_include_directories(bpftrace_test PRIVATE ${CMAKE_SOURCE_DIR}/src)
-target_include_directories(bpftrace_test PRIVATE ${CMAKE_BINARY_DIR})
 target_link_libraries(bpftrace_test libbpftrace)
 
 if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")