diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2019-06-03 09:55:40 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2019-06-03 09:55:59 +0200 |
| commit | e730ea1e3ebe2a5f3b6d93d5c05c3c387fab8c57 (patch) | |
| tree | b8eff5f5c5a206380b88e7b51c68cf575fcd2923 /unittest | |
| parent | c9b49a4be723c18a8fad2bf4fd549079d45a33a5 (diff) | |
| download | mariadb-git-e730ea1e3ebe2a5f3b6d93d5c05c3c387fab8c57.tar.gz | |
Only link mysys_ssl when required.
Do not use TARGET_LINK_LIBRARIES(mysys mysys_ssl),
this means that mysys_ssl is linked to practically everything.
Diffstat (limited to 'unittest')
| -rw-r--r-- | unittest/mysys/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | unittest/sql/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 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) diff --git a/unittest/sql/CMakeLists.txt b/unittest/sql/CMakeLists.txt index f63dc0b2a21..a4ba1019e49 100644 --- a/unittest/sql/CMakeLists.txt +++ b/unittest/sql/CMakeLists.txt @@ -31,6 +31,6 @@ TARGET_LINK_LIBRARIES(explain_filename-t sql mytap) MY_ADD_TEST(explain_filename) ADD_EXECUTABLE(mf_iocache-t mf_iocache-t.cc ../../sql/mf_iocache_encr.cc) -TARGET_LINK_LIBRARIES(mf_iocache-t mysys mytap) +TARGET_LINK_LIBRARIES(mf_iocache-t mysys mytap mysys_ssl) ADD_DEPENDENCIES(mf_iocache-t GenError) MY_ADD_TEST(mf_iocache) |