FT-297 Move tools to tools/

MariaDB · Jul 3, 2014 · e91c66c · e91c66c
1 parent 157e180
commit e91c66c
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 23 deletions.
diff --git a/ft/CMakeLists.txt b/ft/CMakeLists.txt
@@ -87,21 +87,4 @@ target_link_libraries(ft LINK_PRIVATE util_static lzma ${LIBTOKUPORTABILITY})
 target_link_libraries(ft LINK_PUBLIC z)
 target_link_libraries(ft_static LINK_PRIVATE lzma)
 
-## build the bins in this directory
-foreach(tool tokuftdump tdb_logprint tdb-recover ftverify)
-  add_executable(${tool} ${tool})
-  add_dependencies(${tool} install_tdb_h)
-  target_link_libraries(${tool} ft_static util_static z lzma ${LIBTOKUPORTABILITY}_static ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS})
-  add_space_separated_property(TARGET ${tool} COMPILE_FLAGS -fvisibility=hidden)
-endforeach(tool)
-
-# link in math.h library just for this tool.
-target_link_libraries(ftverify m)
-
-install(
-  TARGETS tokuftdump
-  DESTINATION bin
-  COMPONENT tokukv_tools
-  )
-
 add_subdirectory(tests)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -1,9 +1,20 @@
 set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS _GNU_SOURCE DONT_DEPRECATE_ERRNO)
 
-set(utils tokudb_dump)
-foreach(util ${utils})
-  add_executable(${util} ${util})
-  target_link_libraries(${util} ${LIBTOKUDB}_static ft_static z lzma ${LIBTOKUPORTABILITY}_static ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS})
+set(tools tokudb_dump tokuftdump tdb_logprint tdb-recover ftverify)
+foreach(tool ${tools})
+  add_executable(${tool} ${tool})
+  add_dependencies(${tool} install_tdb_h)
+  target_link_libraries(${tool} ${LIBTOKUDB}_static ft_static z lzma ${LIBTOKUPORTABILITY}_static ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS})
+
+  add_space_separated_property(TARGET ${tool} COMPILE_FLAGS -fvisibility=hidden)
+endforeach(tool)
+
+# link in math.h library just for this tool.
+target_link_libraries(ftverify m)
+
+install(
+  TARGETS tokuftdump
+  DESTINATION bin
+  COMPONENT tokukv_tools
+  )
 
-  add_space_separated_property(TARGET ${util} COMPILE_FLAGS -fvisibility=hidden)
-endforeach(util)
diff --git a/ft/ftverify.cc → tools/ftverify.cc b/ft/ftverify.cc → tools/ftverify.cc
diff --git a/ft/tdb-recover.cc → tools/tdb-recover.cc b/ft/tdb-recover.cc → tools/tdb-recover.cc
diff --git a/ft/tdb_logprint.cc → tools/tdb_logprint.cc b/ft/tdb_logprint.cc → tools/tdb_logprint.cc
diff --git a/ft/tokuftdump.cc → tools/tokuftdump.cc b/ft/tokuftdump.cc → tools/tokuftdump.cc