diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 12:21:08 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 12:21:08 +0200 |
| commit | 65e8506ca9d03967191b6ed207cf107d311f7f99 (patch) | |
| tree | 3076ff798884b52655a5961be21e799708a4b628 /cmake | |
| parent | 6adfce9c8d2a63a259dd0504600271498dcda228 (diff) | |
| parent | faddcf3c395da640b760c3f701f5bc1f3baae6c4 (diff) | |
| download | mariadb-git-65e8506ca9d03967191b6ed207cf107d311f7f99.tar.gz | |
Merge branch '10.3' into bb-10.4-releasemariadb-10.4.26
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/cpack_rpm.cmake | 2 | ||||
| -rw-r--r-- | cmake/mysql_add_executable.cmake | 2 | ||||
| -rw-r--r-- | cmake/readline.cmake | 2 | ||||
| -rw-r--r-- | cmake/sign.cmake.in | 2 | ||||
| -rw-r--r-- | cmake/zlib.cmake | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 164dcd0490b..85edf0c1cbc 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -326,7 +326,7 @@ IF(compat53 AND compat101) # RHEL6/CentOS6 install Postfix by default, and it requires # libmysqlclient.so.16 that pulls in mysql-libs-5.1.x # And the latter conflicts with our rpms. - # Make sure that for these distribuions all our rpms require + # Make sure that for these distributions all our rpms require # MariaDB-compat, that will replace mysql-libs-5.1 IF(RPM MATCHES "(rhel|centos)[67]") SET(CPACK_RPM_common_PACKAGE_REQUIRES "MariaDB-compat") diff --git a/cmake/mysql_add_executable.cmake b/cmake/mysql_add_executable.cmake index 54fdab7b17c..f63fcbe3265 100644 --- a/cmake/mysql_add_executable.cmake +++ b/cmake/mysql_add_executable.cmake @@ -22,7 +22,7 @@ # - instruct CPack to install executable under ${CMAKE_INSTALL_PREFIX}/bin directory # On Windows : # - add version resource -# - instruct CPack to do autenticode signing if SIGNCODE is set +# - instruct CPack to do authenticode signing if SIGNCODE is set INCLUDE(CMakeParseArguments) diff --git a/cmake/readline.cmake b/cmake/readline.cmake index c8bbc7fc259..9c35d8c7d22 100644 --- a/cmake/readline.cmake +++ b/cmake/readline.cmake @@ -59,7 +59,7 @@ MACRO (FIND_CURSES) remove CMakeCache.txt and rerun cmake.") IF(CMAKE_SYSTEM_NAME MATCHES "Linux") SET(ERRORMSG ${ERRORMSG} - "On Debian/Ubuntu, package name is libncurses5-dev, on Redhat and derivates " + "On Debian/Ubuntu, package name is libncurses5-dev, on Redhat and derivatives " "it is ncurses-devel.") ENDIF() MESSAGE(FATAL_ERROR ${ERRORMSG}) diff --git a/cmake/sign.cmake.in b/cmake/sign.cmake.in index 50768a3dcc9..6b0fa8b128f 100644 --- a/cmake/sign.cmake.in +++ b/cmake/sign.cmake.in @@ -1,6 +1,6 @@ # If timestamping is used, it can (rarely) fail, when public timestamping service has issues. # -# To handle the error gracefully and tranparently, we'll retry the signtool command, +# To handle the error gracefully and transparently, we'll retry the signtool command, # second time without "/t URL" parameter SET(SIGNTOOL_PARAMETERS_NO_TIMESTAMP "@SIGNTOOL_PARAMETERS@") LIST(FIND SIGNTOOL_PARAMETERS_NO_TIMESTAMP /t idx) diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake index 628bbf15f67..9e085189e4f 100644 --- a/cmake/zlib.cmake +++ b/cmake/zlib.cmake @@ -26,7 +26,7 @@ ENDMACRO() # # Provides the following configure options: # WITH_ZLIB_BUNDLED -# If this is set,we use bindled zlib +# If this is set,we use bundled zlib # If this is not set,search for system zlib. # if system zlib is not found, use bundled copy # ZLIB_LIBRARIES, ZLIB_INCLUDE_DIR and ZLIB_SOURCES |