hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed the way the static embedded library is searched

Browse Source
This commit is contained in:
Markus Makela
2014-09-16 18:16:20 +03:00
parent c0112af04e
commit 81b83f1978
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
macros.cmake
View File

@ -92,13 +92,14 @@ endif()
# Find the embedded mysql library # Find the embedded mysql library
if(STATIC_EMBEDDED) if(STATIC_EMBEDDED)
set(OLD_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
find_file(EMBEDDED_LIB_STATIC libmysqld.a PATHS /usr/lib /usr/lib64 PATH_SUFFIXES mysql mariadb) set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
find_library(EMBEDDED_LIB_STATIC libmysqld.a PATH_SUFFIXES mysql mariadb)
set(EMBEDDED_LIB ${EMBEDDED_LIB_STATIC}) set(EMBEDDED_LIB ${EMBEDDED_LIB_STATIC})
set(CMAKE_FIND_LIBRARY_SUFFIXES ${OLD_SUFFIXES})
else() else()
find_library(EMBEDDED_LIB_DYNAMIC mysqld PATHS /usr/lib /usr/lib64 PATH_SUFFIXES mysql mariadb) find_library(EMBEDDED_LIB_DYNAMIC mysqld PATH_SUFFIXES mysql mariadb)
set(EMBEDDED_LIB ${EMBEDDED_LIB_DYNAMIC}) set(EMBEDDED_LIB ${EMBEDDED_LIB_DYNAMIC})
endif() endif()