diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-09-11 16:21:36 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-09-11 16:21:36 +0200 |
| commit | 8988e471b543a45a1d80ec69b001656057f11141 (patch) | |
| tree | f38947bed845db12857b0a8b03d9433bf2454fd6 /CMakeLists.txt | |
| parent | bcd25e1066bcf545d8f6988ef9f1c0983db2bcfd (diff) | |
| parent | f34517237912d5cb3a6a8d36c0fb91b99f2a1715 (diff) | |
| download | mariadb-git-8988e471b543a45a1d80ec69b001656057f11141.tar.gz | |
Merge branch '10.2' into 10.3
# Conflicts:
# cmake/os/Windows.cmake
# sql/sql_yacc.yy
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5be40ef9765..24cf8bb8069 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -556,3 +556,40 @@ IF(NON_DISTRIBUTABLE_WARNING) MESSAGE(WARNING " You have linked MariaDB with ${NON_DISTRIBUTABLE_WARNING} libraries! You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with the Free Software Foundation.") ENDIF() + +IF(NOT WITHOUT_SERVER) + # Define target for minimal mtr-testable build + ADD_CUSTOM_TARGET(minbuild) + ADD_DEPENDENCIES(minbuild + aria_chk + aria_pack + mysql + mysqladmin + mysqlbinlog + mysqlcheck + mysql_client_test + mysqldump + mysqlimport + mysql_plugin + mysqlshow + mysqlslap + mysqltest + mysql_tzinfo_to_sql + mysql_upgrade + mysqld + my_print_defaults + my_safe_process + myisam_ftdump + myisamchk + myisamlog + myisampack + perror + replace) + IF(WIN32) + ADD_DEPENDENCIES(minbuild echo my_safe_kill) + ENDIF() + ADD_CUSTOM_TARGET(smoketest + COMMAND perl ./mysql-test-run.pl main.1st + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/mysql-test) + ADD_DEPENDENCIES(smoketest minbuild) +ENDIF() |