diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-07 15:00:27 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-07 15:00:27 +0300 |
| commit | 916b237b3f6ee4d8e113d480c53bca232cadbb7b (patch) | |
| tree | 238054b502f633afcb88a3fb1929d860a7e96e91 /libmysqld | |
| parent | a04202673fe8f5a89a88e543e3e0f5b9de5215d2 (diff) | |
| parent | 35977e81f967ebe10db8ee40703801e693b2a0f4 (diff) | |
| download | mariadb-git-916b237b3f6ee4d8e113d480c53bca232cadbb7b.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 5b8c08178cc..d3457cfc785 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -390,9 +390,9 @@ IF(NOT DISABLE_SHARED) # libmysqld SET_TARGET_PROPERTIES(libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1) SET_TARGET_PROPERTIES(mysqlserver PROPERTIES CLEAN_DIRECT_OUTPUT 1) - TARGET_LINK_LIBRARIES(mysqlserver tpool) + TARGET_LINK_LIBRARIES(mysqlserver LINK_PRIVATE tpool ${CRC32_LIBRARY}) IF(LIBMYSQLD_SO_EXTRA_LIBS) - TARGET_LINK_LIBRARIES(libmysqld ${LIBMYSQLD_SO_EXTRA_LIBS}) + TARGET_LINK_LIBRARIES(libmysqld LINK_PRIVATE ${LIBMYSQLD_SO_EXTRA_LIBS}) ENDIF() ENDIF() ENDIF() |