mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-05 14:45:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge the compilation fixes from 10.0-FusionIO

Browse source
This commit is contained in:
Sergei Golubchik 2014-05-26 21:11:53 +02:00
commit 6a85b10dcb
15 changed files with 47 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cmake/lzo.cmake
View file

@ -14,8 +14,8 @@
MACRO (MYSQL_CHECK_LZO_STATIC)
CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H)
CHECK_LIBRARY_EXISTS(liblzo2.a lzo1x_1_compress "" HAVE_LZO_LIB)
#CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H)
#CHECK_LIBRARY_EXISTS(liblzo2.a lzo1x_1_compress "" HAVE_LZO_LIB)
IF(HAVE_LZO_LIB AND HAVE_LZO_H)
ADD_DEFINITIONS(-DHAVE_LZO=1)
@ -25,10 +25,10 @@ ENDMACRO()
MACRO (MYSQL_CHECK_LZO)
CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H)
CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress "" HAVE_LZO_LIB)
#CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H)
#CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress "" HAVE_LZO_SHARED_LIB)
IF(HAVE_LZO_LIB AND HAVE_LZO_H)
IF(HAVE_LZO_SHARED_LIB AND HAVE_LZO_H)
ADD_DEFINITIONS(-DHAVE_LZO=1)
LINK_LIBRARIES(lzo2)
ENDIF()