Skip to content

Commit f5607f3

Browse files
committed
[C++] Use target_include_directories instead of global declaration.
1 parent 435d9ff commit f5607f3

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,7 @@ set(CODEC_PERF_SCHEMA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sbe-benchmarks/src/main/r
129129
set(CODEC_EXAMPLES_SCHEMA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sbe-samples/src/main/resources")
130130

131131
include_directories(
132-
${GTEST_SOURCE_DIR}/googletest/include
133-
${GTEST_SOURCE_DIR}/googlemock/include
134132
${CMAKE_CURRENT_SOURCE_DIR}/sbe-tool/src/main/cpp
135-
${CODEC_TARGET_DIR}
136133
)
137134

138135
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sbe-tool/src/main/cpp)

sbe-benchmarks/src/main/cpp/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ add_custom_command(
4444
add_custom_target(perf_codecs DEPENDS ${GENERATED_CODECS})
4545

4646
add_executable(benchlet-sbe-car-runner ${SRCS_BENCHLET_MAIN} CarBench.cpp)
47+
target_include_directories(benchlet-sbe-car-runner PRIVATE ${CODEC_TARGET_DIR})
4748
add_executable(benchlet-sbe-md-runner ${SRCS_BENCHLET_MAIN} MarketDataBench.cpp)
49+
target_include_directories(benchlet-sbe-md-runner PRIVATE ${CODEC_TARGET_DIR})
4850
add_dependencies(benchlet-sbe-md-runner perf_codecs)
4951
add_dependencies(benchlet-sbe-car-runner perf_codecs)
5052

sbe-samples/src/main/cpp/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ add_custom_command(
3131
add_custom_target(examples_codecs DEPENDS ${GENERATED_CODECS})
3232

3333
add_executable(GeneratedStubExample GeneratedStubExample.cpp)
34+
target_include_directories(GeneratedStubExample PRIVATE ${CODEC_TARGET_DIR})
3435
add_executable(OtfExample OtfExample.cpp)
36+
target_include_directories(OtfExample PRIVATE ${CODEC_TARGET_DIR})
3537
target_link_libraries(OtfExample sbe)
3638

3739
add_dependencies(GeneratedStubExample examples_codecs)

sbe-tool/src/test/cpp/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616

1717
function(sbe_test name)
1818
add_executable("${name}" "${name}.cpp")
19+
target_include_directories("${name}"
20+
PRIVATE ${GTEST_SOURCE_DIR}/googletest/include
21+
PRIVATE ${CODEC_TARGET_DIR}
22+
)
1923
target_link_libraries("${name}" sbe ${GTEST_LIBS} ${CMAKE_THREAD_LIBS_INIT})
2024
add_test(NAME ${name} COMMAND ${name} WORKING_DIRECTORY ${CODEC_TARGET_DIR})
2125
add_dependencies(${name} gtest)

0 commit comments

Comments
 (0)