diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-05-09 20:25:21 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-05-09 20:36:58 +0200 |
| commit | f5844e7c4bc693783f088a5fc9c399b786ddc8c1 (patch) | |
| tree | 37abe4fcaf0c48ed6422fea06b8b7f33c6bac945 /CMakeLists.txt | |
| parent | 5b0df7433d36cc0fa220f3593382908198ad87a3 (diff) | |
| parent | 607467bd63db2c6ca64610eb9f4e703711f4dfc6 (diff) | |
| download | mariadb-git-f5844e7c4bc693783f088a5fc9c399b786ddc8c1.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 50257e5c7cf..d930b593479 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -242,8 +242,6 @@ IF(SECURITY_HARDENED AND NOT WITH_ASAN AND NOT WITH_UBSAN AND NOT WITH_TSAN) ENDIF() INCLUDE(wsrep) -INCLUDE(cpack_rpm) -INCLUDE(cpack_deb) OPTION(WITH_DBUG_TRACE "Enable DBUG_ENTER()/DBUG_EXIT()" ON) IF(WITH_DBUG_TRACE) @@ -369,8 +367,6 @@ MYSQL_CHECK_SSL() MYSQL_CHECK_READLINE() SET(MALLOC_LIBRARY "system") -SET(PYTHON_SHEBANG "/usr/bin/env python" CACHE STRING "python shebang") -MARK_AS_ADVANCED(PYTHON_SHEBANG) CHECK_PCRE() @@ -407,6 +403,12 @@ SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "") INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb) +INCLUDE(cpack_rpm) +INCLUDE(cpack_deb) + +SET(PYTHON_SHEBANG "/usr/bin/env python" CACHE STRING "python shebang") +MARK_AS_ADVANCED(PYTHON_SHEBANG) + # Add storage engines and plugins. CONFIGURE_PLUGINS() |