VladPolskiy/MariaDB
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 12:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

MDEV-33876 CMake, zlib - use names compatible with official FindZLIB.cmake

Browse Source 
- ZLIB_LIBRARIES, not ZLIB_LIBRARY
- ZLIB_INCLUDE_DIRS, not ZLIB_INCLUDE_DIR

For building libmariadb, ZLIB_LIBRARY/ZLIB_INCLUDE_DIR are still defined
This workaround will be removed later.
This commit is contained in:
Vladislav Vaintroub
2024-05-02 23:11:38 +02:00
parent 9ec7819c58
commit 029e2a5fd9
17 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unittest/mysys/CMakeLists.txt
View File

@ -19,7 +19,7 @@ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
MY_ADD_TESTS(aes LINK_LIBRARIES mysys mysys_ssl)
ADD_DEFINITIONS(${SSL_DEFINES})
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
MY_ADD_TESTS(ma_dyncol LINK_LIBRARIES mysys)
IF(WIN32)