Commit 565e6820 authored by Leif Walsh's avatar Leif Walsh Committed by Yoni Fogel

[t:4948] remove test1426.bdbdump from cmake files, add dependency on log code generation for tags

git-svn-id: file:///svn/toku/tokudb@44090 c7de825b-a66e-492c-adef-691d508d4ae1
parent 6186d486
...@@ -34,7 +34,7 @@ if (USE_CTAGS) ...@@ -34,7 +34,7 @@ if (USE_CTAGS)
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ctags-stamp" OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ctags-stamp"
COMMAND ${CTAGS} -o tags ${all_srcs} ${all_hdrs} COMMAND ${CTAGS} -o tags ${all_srcs} ${all_hdrs}
COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/ctags-stamp" COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/ctags-stamp"
DEPENDS ${all_srcs} ${all_hdrs} install_tdb_h generate_config_h DEPENDS ${all_srcs} ${all_hdrs} install_tdb_h generate_config_h generate_log_code
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
add_custom_target(build_ctags ALL DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/tags" ctags-stamp) add_custom_target(build_ctags ALL DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/tags" ctags-stamp)
endif () endif ()
...@@ -49,7 +49,7 @@ if (USE_ETAGS) ...@@ -49,7 +49,7 @@ if (USE_ETAGS)
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/etags-stamp" OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/etags-stamp"
COMMAND ${ETAGS} -o TAGS ${all_srcs} ${all_hdrs} COMMAND ${ETAGS} -o TAGS ${all_srcs} ${all_hdrs}
COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/etags-stamp" COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/etags-stamp"
DEPENDS ${all_srcs} ${all_hdrs} install_tdb_h generate_config_h DEPENDS ${all_srcs} ${all_hdrs} install_tdb_h generate_config_h generate_log_code
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
add_custom_target(build_etags ALL DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/TAGS" etags-stamp) add_custom_target(build_etags ALL DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/TAGS" etags-stamp)
endif () endif ()
...@@ -64,7 +64,7 @@ if (USE_CSCOPE) ...@@ -64,7 +64,7 @@ if (USE_CSCOPE)
OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/cscope.in.out" OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/cscope.in.out"
OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/cscope.po.out" OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/cscope.po.out"
COMMAND ${CSCOPE} -b -q -R COMMAND ${CSCOPE} -b -q -R
DEPENDS ${all_srcs} ${all_hdrs} install_tdb_h generate_config_h DEPENDS ${all_srcs} ${all_hdrs} install_tdb_h generate_config_h generate_log_code
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
add_custom_target(build_cscope.out ALL DEPENDS add_custom_target(build_cscope.out ALL DEPENDS
"${CMAKE_CURRENT_SOURCE_DIR}/cscope.out" "${CMAKE_CURRENT_SOURCE_DIR}/cscope.out"
...@@ -83,7 +83,7 @@ if (USE_GTAGS) ...@@ -83,7 +83,7 @@ if (USE_GTAGS)
OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/GRTAGS" OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/GRTAGS"
OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/GPATH" OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/GPATH"
COMMAND ${GTAGS} --gtagsconf "${CMAKE_CURRENT_SOURCE_DIR}/.globalrc" COMMAND ${GTAGS} --gtagsconf "${CMAKE_CURRENT_SOURCE_DIR}/.globalrc"
DEPENDS ${all_srcs} ${all_hdrs} install_tdb_h generate_config_h DEPENDS ${all_srcs} ${all_hdrs} install_tdb_h generate_config_h generate_log_code
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
add_custom_target(build_GTAGS ALL DEPENDS add_custom_target(build_GTAGS ALL DEPENDS
"${CMAKE_CURRENT_SOURCE_DIR}/GTAGS" "${CMAKE_CURRENT_SOURCE_DIR}/GTAGS"
......
...@@ -16,6 +16,10 @@ add_custom_command( ...@@ -16,6 +16,10 @@ add_custom_command(
COMMAND $<TARGET_FILE:logformat> . COMMAND $<TARGET_FILE:logformat> .
DEPENDS logformat DEPENDS logformat
) )
add_custom_target(
generate_log_code
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/log_code.c" "${CMAKE_CURRENT_BINARY_DIR}/log_print.c" "${CMAKE_CURRENT_BINARY_DIR}/log_header.h"
)
set(FT_SOURCES set(FT_SOURCES
block_allocator.c block_allocator.c
......
...@@ -361,7 +361,6 @@ if(BUILD_TESTING) ...@@ -361,7 +361,6 @@ if(BUILD_TESTING)
endmacro(declare_custom_bdb_tests) endmacro(declare_custom_bdb_tests)
declare_custom_bdb_tests(test1426.bdb) declare_custom_bdb_tests(test1426.bdb)
file(COPY test1426.bdbdump DESTINATION .)
configure_file(run_test1426.sh . COPYONLY) configure_file(run_test1426.sh . COPYONLY)
add_test(NAME test1426.tdb add_test(NAME test1426.tdb
COMMAND run_test1426.sh COMMAND run_test1426.sh
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment