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
366e847e
Commit
366e847e
authored
Apr 28, 2013
by
Leif Walsh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#6 don't do cmake install if we're a subproject of mysql
parent
db33a7c7
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
69 additions
and
48 deletions
+69
-48
buildheader/CMakeLists.txt
buildheader/CMakeLists.txt
+12
-9
cmake_modules/TokuThirdParty.cmake
cmake_modules/TokuThirdParty.cmake
+7
-4
examples/CMakeLists.txt
examples/CMakeLists.txt
+14
-11
portability/CMakeLists.txt
portability/CMakeLists.txt
+11
-8
src/CMakeLists.txt
src/CMakeLists.txt
+7
-4
toku_include/CMakeLists.txt
toku_include/CMakeLists.txt
+11
-8
util/CMakeLists.txt
util/CMakeLists.txt
+7
-4
No files found.
buildheader/CMakeLists.txt
View file @
366e847e
...
@@ -13,12 +13,15 @@ add_custom_command(
...
@@ -13,12 +13,15 @@ add_custom_command(
add_custom_target
(
install_tdb_h DEPENDS
add_custom_target
(
install_tdb_h DEPENDS
"
${
CMAKE_CURRENT_BINARY_DIR
}
/db.h"
)
"
${
CMAKE_CURRENT_BINARY_DIR
}
/db.h"
)
install
(
# detect when we are being built as a subproject
FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/db.h"
if
(
NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING
)
DESTINATION include
install
(
RENAME tokudb.h
FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/db.h"
)
DESTINATION include
install
(
RENAME tokudb.h
FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/db.h"
)
DESTINATION include
install
(
)
FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/db.h"
DESTINATION include
)
endif
()
\ No newline at end of file
cmake_modules/TokuThirdParty.cmake
View file @
366e847e
...
@@ -27,10 +27,13 @@ set_target_properties(jemalloc_nopic PROPERTIES IMPORTED_LOCATION
...
@@ -27,10 +27,13 @@ set_target_properties(jemalloc_nopic PROPERTIES IMPORTED_LOCATION
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
CMAKE_CFG_INTDIR
}
/jemalloc/lib/libjemalloc.a"
)
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
CMAKE_CFG_INTDIR
}
/jemalloc/lib/libjemalloc.a"
)
add_dependencies
(
jemalloc_nopic build_jemalloc
)
add_dependencies
(
jemalloc_nopic build_jemalloc
)
install
(
# detect when we are being built as a subproject
DIRECTORY
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
CMAKE_CFG_INTDIR
}
/jemalloc/lib"
if
(
NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING
)
DESTINATION .
install
(
)
DIRECTORY
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
CMAKE_CFG_INTDIR
}
/jemalloc/lib"
DESTINATION .
)
endif
()
## add lzma with an external project
## add lzma with an external project
set
(
xz_configure_opts --with-pic --enable-static
)
set
(
xz_configure_opts --with-pic --enable-static
)
...
...
examples/CMakeLists.txt
View file @
366e847e
install
(
# detect when we are being built as a subproject
FILES
if
(
NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING
)
db-insert.c
install
(
db-insert-multiple.c
FILES
db-scan.c
db-insert.c
db-update.c
db-insert-multiple.c
Makefile
db-scan.c
README.examples
db-update.c
DESTINATION
Makefile
examples
README.examples
)
DESTINATION
\ No newline at end of file
examples
)
endif
()
\ No newline at end of file
portability/CMakeLists.txt
View file @
366e847e
...
@@ -29,13 +29,16 @@ set_property(TARGET ${LIBTOKUPORTABILITY} tokuportability_static_conv APPEND PRO
...
@@ -29,13 +29,16 @@ set_property(TARGET ${LIBTOKUPORTABILITY} tokuportability_static_conv APPEND PRO
set_property
(
SOURCE file memory os_malloc portability toku_assert toku_rwlock APPEND PROPERTY
set_property
(
SOURCE file memory os_malloc portability toku_assert toku_rwlock APPEND PROPERTY
COMPILE_DEFINITIONS TOKU_ALLOW_DEPRECATED=1
)
COMPILE_DEFINITIONS TOKU_ALLOW_DEPRECATED=1
)
install
(
# detect when we are being built as a subproject
FILES toku_os_types.h toku_time.h
if
(
NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING
)
DESTINATION include
install
(
)
FILES toku_os_types.h toku_time.h
install
(
DESTINATION include
TARGETS
${
LIBTOKUPORTABILITY
}
${
LIBTOKUPORTABILITY
}
_static
)
DESTINATION lib
install
(
)
TARGETS
${
LIBTOKUPORTABILITY
}
${
LIBTOKUPORTABILITY
}
_static
DESTINATION lib
)
endif
()
add_subdirectory
(
tests
)
add_subdirectory
(
tests
)
src/CMakeLists.txt
View file @
366e847e
...
@@ -39,9 +39,12 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
...
@@ -39,9 +39,12 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
add_space_separated_property
(
TARGET
${
LIBTOKUDB
}
LINK_FLAGS
"-Wl,--version-script=
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
CMAKE_CFG_INTDIR
}
/export.map"
)
add_space_separated_property
(
TARGET
${
LIBTOKUDB
}
LINK_FLAGS
"-Wl,--version-script=
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
CMAKE_CFG_INTDIR
}
/export.map"
)
endif
()
endif
()
install
(
# detect when we are being built as a subproject
TARGETS
${
LIBTOKUDB
}
${
LIBTOKUDB
}
_static
if
(
NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING
)
DESTINATION lib
install
(
)
TARGETS
${
LIBTOKUDB
}
${
LIBTOKUDB
}
_static
DESTINATION lib
)
endif
()
add_subdirectory
(
tests
)
add_subdirectory
(
tests
)
toku_include/CMakeLists.txt
View file @
366e847e
...
@@ -2,11 +2,14 @@ configure_file(toku_config.h.in toku_config.h)
...
@@ -2,11 +2,14 @@ configure_file(toku_config.h.in toku_config.h)
add_custom_target
(
generate_config_h DEPENDS
add_custom_target
(
generate_config_h DEPENDS
"
${
CMAKE_CURRENT_BINARY_DIR
}
/toku_config.h"
)
"
${
CMAKE_CURRENT_BINARY_DIR
}
/toku_config.h"
)
install
(
# detect when we are being built as a subproject
FILES toku_list.h toku_os.h
if
(
NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING
)
DESTINATION include
install
(
)
FILES toku_list.h toku_os.h
install
(
DESTINATION include
FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/toku_config.h"
)
DESTINATION include
install
(
)
FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/toku_config.h"
DESTINATION include
)
endif
()
\ No newline at end of file
util/CMakeLists.txt
View file @
366e847e
...
@@ -14,9 +14,12 @@ target_link_libraries(util LINK_PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_
...
@@ -14,9 +14,12 @@ target_link_libraries(util LINK_PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_
add_dependencies
(
util install_tdb_h
)
add_dependencies
(
util install_tdb_h
)
add_dependencies
(
util_static install_tdb_h
)
add_dependencies
(
util_static install_tdb_h
)
install
(
# detect when we are being built as a subproject
FILES partitioned_counter.h
if
(
NOT DEFINED MYSQL_PROJECT_NAME_DOCSTRING
)
DESTINATION include
install
(
)
FILES partitioned_counter.h
DESTINATION include
)
endif
()
add_subdirectory
(
tests
)
add_subdirectory
(
tests
)
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