Skip to content

Fix RUN_GTEST/RUN_GBENCH leak into pax.so build #1591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
avamingli merged 1 commit into from
Mar 5, 2026
+2 −2
Merged

Fix RUN_GTEST/RUN_GBENCH leak into pax.so build #1591

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions contrib/pax_storage/src/cpp/cmake/pax.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,14 +223,14 @@ add_custom_command(TARGET pax POST_BUILD

if (BUILD_GTEST)
add_subdirectory(contrib/googletest)
ADD_DEFINITIONS(-DRUN_GTEST)
file(GLOB test_case_sources
pax_gtest_helper.cc
pax_gtest.cc
${CMAKE_CURRENT_SOURCE_DIR}/*/*_test.cc
${CMAKE_CURRENT_SOURCE_DIR}/*/*/*_test.cc)

add_executable(test_main ${pax_target_src} ${test_case_sources})
target_compile_definitions(test_main PRIVATE RUN_GTEST)
add_dependencies(test_main ${pax_target_dependencies} gtest gmock)
target_include_directories(test_main PUBLIC ${pax_target_include} ${CMAKE_CURRENT_SOURCE_DIR} ${gtest_SOURCE_DIR}/include contrib/cpp-stub/src/ contrib/cpp-stub/src_linux/)

Expand All @@ -240,13 +240,13 @@ endif(BUILD_GTEST)

if(BUILD_GBENCH)
add_subdirectory(contrib/googlebench)
ADD_DEFINITIONS(-DRUN_GBENCH)
file(GLOB bench_sources
pax_gbench.cc
${CMAKE_CURRENT_SOURCE_DIR}/*/*_bench.cc
${CMAKE_CURRENT_SOURCE_DIR}/*/*/*_bench.cc)

add_executable(bench_main ${pax_target_src} ${bench_sources})
target_compile_definitions(bench_main PRIVATE RUN_GBENCH)
add_dependencies(bench_main ${pax_target_dependencies} gtest gmock)
target_include_directories(bench_main PUBLIC ${pax_target_include} ${CMAKE_CURRENT_SOURCE_DIR} contrib/googlebench/include contrib/cpp-stub/src/ contrib/cpp-stub/src_linux/)
link_directories(contrib/googlebench/src)
Expand Down
Loading