Commit 0a06abb4 authored by Bradley C. Kuszmaul's avatar Bradley C. Kuszmaul

Revert "Make the hotbackup library link up"

This reverts commit 843f0050.

Should have been on a branch.
parent d0223116
...@@ -67,4 +67,3 @@ install( ...@@ -67,4 +67,3 @@ install(
## build tags ## build tags
include(TokuBuildTagDatabases) include(TokuBuildTagDatabases)
...@@ -105,25 +105,3 @@ add_library(lzma STATIC IMPORTED) ...@@ -105,25 +105,3 @@ add_library(lzma STATIC IMPORTED)
set_target_properties(lzma PROPERTIES IMPORTED_LOCATION set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a") "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a")
add_dependencies(lzma build_lzma) add_dependencies(lzma build_lzma)
## add backup_enterprise with an external project
set(HOTBACKUP_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/backup-enterprise/backup" CACHE FILEPATH "Where to find backup enterprise sources.")
if (EXISTS "${HOTBACKUP_SOURCE_DIR}/CMakeLists.txt")
set(hotbackup_configure_opts "CC=${CMAKE_C_COMPILER}" "CXX=${CMAKE_CXX_COMPILER}")
ExternalProject_Add(backup-enterprise
PREFIX backup-enterprise
SOURCE_DIR "${HOTBACKUP_SOURCE_DIR}"
#INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/backup-enterprise"
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
)
# ExternalProject_Add_Step(backup-enterprise
# COMMAND cp "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libHotBackup.so"
add_library(HotBackup SHARED IMPORTED GLOBAL)
set_property(TARGET HotBackup PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/backup-enterprise/lib/libHotBackup.so)
# set_target_properties(HotBackup PROPERTIES IMPORTED_LOCATION
# "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/libHotBackup.so")
install(DIRECTORY "${install_dir}/lib" DESTINATION .
COMPONENT tokukv_libs_extra)
endif ()
\ No newline at end of file
...@@ -390,12 +390,6 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS) ...@@ -390,12 +390,6 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS)
add_space_separated_property(TARGET ${base}.tdb COMPILE_FLAGS -fvisibility=hidden) add_space_separated_property(TARGET ${base}.tdb COMPILE_FLAGS -fvisibility=hidden)
endforeach(bin) endforeach(bin)
foreach(bin ${tdb_bins})
get_filename_component(base ${bin} NAME_WE)
target_link_libraries(${base}.tdb HotBackup)
endforeach(bin)
if(BDB_FOUND) if(BDB_FOUND)
foreach(bin ${bdb_bins}) foreach(bin ${bdb_bins})
get_filename_component(base ${bin} NAME_WE) get_filename_component(base ${bin} NAME_WE)
......
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