cmake: Remove all PUBLIC target_include_directory() usage

This makes it so include directories aren't propagated from a target to
its dependencies. This causes quite a bit of duplication in cmake, but
what it really does is makes our inclusion structure explicit.

Author: danobi

src/CMakeLists.txt

@@ -58,11 +58,15 @@ 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} PUBLIC ${CMAKE_BINARY_DIR}/src)
+target_include_directories(${BPFTRACE} PRIVATE ${CMAKE_SOURCE_DIR}/src)
+target_include_directories(${BPFTRACE} PRIVATE ${CMAKE_BINARY_DIR}/src)
+target_include_directories(${BPFTRACE} PRIVATE ${CMAKE_BINARY_DIR})
 
 install(TARGETS ${BPFTRACE} DESTINATION ${CMAKE_INSTALL_BINDIR})
 target_link_libraries(${BPFTRACE} libbpftrace)

src/aot/CMakeLists.txt

@@ -1,9 +1,9 @@
 add_library(aot STATIC aot.cpp)
 add_dependencies(aot parser version_h)
 target_link_libraries(aot required_resources)
-target_include_directories(aot PUBLIC ${CMAKE_SOURCE_DIR}/src)
-target_include_directories(aot PUBLIC ${CMAKE_BINARY_DIR}/src)
-target_include_directories(aot PUBLIC ${CMAKE_BINARY_DIR})
+target_include_directories(aot PRIVATE ${CMAKE_SOURCE_DIR}/src)
+target_include_directories(aot PRIVATE ${CMAKE_BINARY_DIR}/src)
+target_include_directories(aot PRIVATE ${CMAKE_BINARY_DIR})
 target_compile_definitions(aot PRIVATE ${BPFTRACE_FLAGS})
 
 if(STATIC_LINKING)
@@ -19,6 +19,9 @@ 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_include_directories(bpftrace-aotrt PRIVATE ${CMAKE_BINARY_DIR}/src)
 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

@@ -18,4 +18,4 @@ else()
   message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}")
 endif()
 
-target_include_directories(arch PUBLIC ${CMAKE_SOURCE_DIR}/src)
+target_include_directories(arch PRIVATE ${CMAKE_SOURCE_DIR}/src)

src/ast/CMakeLists.txt

@@ -1,4 +1,7 @@
 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
   async_event_types.cpp
@@ -22,13 +25,10 @@ add_library(ast STATIC
   passes/return_path_analyser.cpp
 )
 
-target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src)
-target_include_directories(ast_defs PUBLIC ${CMAKE_BINARY_DIR})
-target_link_libraries(ast ast_defs arch parser)
-
-add_dependencies(ast_defs parser)
-
+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)
 
 if(STATIC_LINKING)
   include(Util)

tests/CMakeLists.txt

@@ -65,6 +65,9 @@ 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_include_directories(bpftrace_test PRIVATE ${CMAKE_BINARY_DIR}/src)
 target_link_libraries(bpftrace_test libbpftrace)
 
 if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")

tests/testprogs/CMakeLists.txt

@@ -36,6 +36,6 @@ foreach(testprog_source ${testprog_sources})
 endforeach()
 add_custom_target(testprogs DEPENDS ${testprogtargets})
 
-target_include_directories(usdt_lib PUBLIC ${CMAKE_SOURCE_DIR}/tests/testlibs/)
+target_include_directories(usdt_lib PRIVATE ${CMAKE_SOURCE_DIR}/tests/testlibs/)
 target_compile_options(usdt_lib PRIVATE -fPIC)
 target_link_libraries(usdt_lib usdt_tp)