diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-27 11:08:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-27 11:08:51 +0300 |
| commit | c0cd662b986c378d536cff511ba7ba342fcd7012 (patch) | |
| tree | 3e847036333ae9fe7a4e0a127e7c303376334cf8 /CMakeLists.txt | |
| parent | ff10e0f6461f875967728228f71c8909eeaf41c4 (diff) | |
| parent | e32212c63c9675591e9c4b15c1bce9f61ec02eb8 (diff) | |
| download | mariadb-git-c0cd662b986c378d536cff511ba7ba342fcd7012.tar.gz | |
Merge 10.4 to 10.5
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 82b6690e3fd..a327556d8d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -351,7 +351,7 @@ IF(NOT HAVE_CXX_NEW) ENDIF() # Find header files from the bundled libraries -# (yassl, readline, pcre, etc) +# (wolfssl, readline, pcre, etc) # before the ones installed in the system SET(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) @@ -364,7 +364,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include) # Add bundled or system zlib. MYSQL_CHECK_ZLIB_WITH_COMPRESS() -# Add bundled yassl/taocrypt or system openssl. +# Add bundled wolfssl/wolfcrypt or system openssl. MYSQL_CHECK_SSL() # Add readline or libedit. MYSQL_CHECK_READLINE() |