diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-20 16:23:47 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-20 16:23:47 +0200 |
| commit | e8113f7572ef7eab45b7b696429101690caeeed4 (patch) | |
| tree | 8a49dbb8a5ad672cd5e002726a6a79a1cf799ad7 /CMakeLists.txt | |
| parent | 4eeea4e212755408ca963d22faa11c12963c1d0a (diff) | |
| download | mariadb-git-e8113f7572ef7eab45b7b696429101690caeeed4.tar.gz | |
CMake cleanup: Make WITH_URING, WITH_PMEM Boolean
The new default values WITH_URING:BOOL=OFF, WITH_PMEM:BOOL=OFF imply
that the dependencies are optional.
An explicit request WITH_URING=ON or WITH_PMEM=ON will cause the
build to fail if the requested dependencies are not available.
Last, to prevent a feature to be built in even though the built-time
dependencies are available, the following can be used:
cmake -DCMAKE_DISABLE_FIND_PACKAGE_URING=1
cmake -DCMAKE_DISABLE_FIND_PACKAGE_PMEM=1
This cleanup was suggested by Vladislav Vaintroub.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 13dce3cafc4..a0b540f12d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,8 +173,6 @@ INCLUDE(systemd) INCLUDE(mysql_add_executable) INCLUDE(symlinks) INCLUDE(compile_flags) -INCLUDE(pmem) -INCLUDE(uring) # Handle options OPTION(DISABLE_SHARED @@ -395,7 +393,7 @@ MYSQL_CHECK_READLINE() SET(MALLOC_LIBRARY "system") CHECK_PCRE() -CHECK_URING() +ADD_SUBDIRECTORY(tpool) CHECK_SYSTEMD() IF(CMAKE_CROSSCOMPILING) @@ -448,7 +446,6 @@ ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) ADD_SUBDIRECTORY(sql/share) -ADD_SUBDIRECTORY(tpool) IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(tests) |