diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-11 13:00:18 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-11 13:00:18 +0300 |
commit | b42dbdbccd3b939394ca9b608ad91a04235e95f1 (patch) | |
tree | e969f314963faa202fdb6f87d5aca67810844742 /unittest/mysys | |
parent | 490dcfd5d74ce45cbdd6105e4295116f6a944e2b (diff) | |
parent | cbac8f935182ecc5bb907de3ae48942467f0b8ba (diff) | |
download | mariadb-git-b42dbdbccd3b939394ca9b608ad91a04235e95f1.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'unittest/mysys')
-rw-r--r-- | unittest/mysys/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unittest/mysys/CMakeLists.txt b/unittest/mysys/CMakeLists.txt index f06d63d05fb..1d97340784d 100644 --- a/unittest/mysys/CMakeLists.txt +++ b/unittest/mysys/CMakeLists.txt @@ -14,10 +14,10 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring - aes byte_order + byte_order LINK_LIBRARIES mysys) MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys) - +MY_ADD_TESTS(aes LINK_LIBRARIES mysys mysys_ssl) ADD_DEFINITIONS(${SSL_DEFINES}) MY_ADD_TESTS(ma_dyncol LINK_LIBRARIES mysys) |