Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
0a06abb4
Commit
0a06abb4
authored
Feb 14, 2014
by
Bradley C. Kuszmaul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Make the hotbackup library link up"
This reverts commit
843f0050
. Should have been on a branch.
parent
d0223116
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
29 deletions
+0
-29
CMakeLists.txt
CMakeLists.txt
+0
-1
cmake_modules/TokuThirdParty.cmake
cmake_modules/TokuThirdParty.cmake
+0
-22
src/tests/CMakeLists.txt
src/tests/CMakeLists.txt
+0
-6
No files found.
CMakeLists.txt
View file @
0a06abb4
...
@@ -67,4 +67,3 @@ install(
...
@@ -67,4 +67,3 @@ install(
## build tags
## build tags
include
(
TokuBuildTagDatabases
)
include
(
TokuBuildTagDatabases
)
cmake_modules/TokuThirdParty.cmake
View file @
0a06abb4
...
@@ -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
src/tests/CMakeLists.txt
View file @
0a06abb4
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment