Skip to content

Commit 728bb61

Browse files
committed
cmake: Move generated version.h into CMAKE_BINARY_DIR
No need to have two locations for generated code. Keeping it all in build root reduces amount of cmake.
1 parent d8610b9 commit 728bb61

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

src/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ add_executable(${BPFTRACE}
6565
${MAIN_SRC}
6666
)
6767
target_include_directories(${BPFTRACE} PRIVATE ${CMAKE_SOURCE_DIR}/src)
68-
target_include_directories(${BPFTRACE} PRIVATE ${CMAKE_BINARY_DIR}/src)
6968
target_include_directories(${BPFTRACE} PRIVATE ${CMAKE_BINARY_DIR})
7069

7170
install(TARGETS ${BPFTRACE} DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -108,7 +107,7 @@ target_compile_definitions(runtime PUBLIC SYSTEM_INCLUDE_PATHS="${SYSTEM_INCLUDE
108107
add_custom_target(version_h
109108
COMMAND ${CMAKE_COMMAND}
110109
-DVERSION_H_IN=${CMAKE_CURRENT_SOURCE_DIR}/version.h.in
111-
-DVERSION_H=${CMAKE_CURRENT_BINARY_DIR}/version.h
110+
-DVERSION_H=${CMAKE_BINARY_DIR}/version.h
112111
-Dbpftrace_VERSION_MAJOR=${bpftrace_VERSION_MAJOR}
113112
-Dbpftrace_VERSION_MINOR=${bpftrace_VERSION_MINOR}
114113
-Dbpftrace_VERSION_PATCH=${bpftrace_VERSION_PATCH}

src/aot/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ add_library(aot STATIC aot.cpp)
22
add_dependencies(aot parser version_h)
33
target_link_libraries(aot required_resources)
44
target_include_directories(aot PRIVATE ${CMAKE_SOURCE_DIR}/src)
5-
target_include_directories(aot PRIVATE ${CMAKE_BINARY_DIR}/src)
65
target_include_directories(aot PRIVATE ${CMAKE_BINARY_DIR})
76
target_compile_definitions(aot PRIVATE ${BPFTRACE_FLAGS})
87

@@ -21,7 +20,6 @@ endif()
2120
add_executable(bpftrace-aotrt aot_main.cpp)
2221
target_include_directories(bpftrace-aotrt PRIVATE ${CMAKE_SOURCE_DIR}/src)
2322
target_include_directories(bpftrace-aotrt PRIVATE ${CMAKE_BINARY_DIR})
24-
target_include_directories(bpftrace-aotrt PRIVATE ${CMAKE_BINARY_DIR}/src)
2523
target_link_libraries(bpftrace-aotrt aot runtime arch ast ast_defs cxxdemangler_stdlib)
2624
install(TARGETS bpftrace-aotrt DESTINATION ${CMAKE_INSTALL_BINDIR})
2725

tests/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ target_include_directories(bpftrace_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
6767
target_compile_definitions(bpftrace_test PRIVATE TEST_CODEGEN_LOCATION="${CMAKE_SOURCE_DIR}/tests/codegen/llvm/")
6868
target_include_directories(bpftrace_test PRIVATE ${CMAKE_SOURCE_DIR}/src)
6969
target_include_directories(bpftrace_test PRIVATE ${CMAKE_BINARY_DIR})
70-
target_include_directories(bpftrace_test PRIVATE ${CMAKE_BINARY_DIR}/src)
7170
target_link_libraries(bpftrace_test libbpftrace)
7271

7372
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")

0 commit comments

Comments
 (0)