diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-05-26 21:11:53 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-05-26 21:11:53 +0200 |
| commit | 6a85b10dcb39b41587ce66d0434c651182d33832 (patch) | |
| tree | 3853fc7a69b927eab820d1826665b6a1b297f1fa /cmake | |
| parent | 1016ee9d77e8c9cd6e9bd114b808fff66f398255 (diff) | |
| parent | 4e68fafad44fbb5ea57a3cf9a750690d88f6fe1c (diff) | |
| download | mariadb-git-6a85b10dcb39b41587ce66d0434c651182d33832.tar.gz | |
merge the compilation fixes from 10.0-FusionIO
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/lzo.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmake/lzo.cmake b/cmake/lzo.cmake index 596dfdcde8b..5a073a6a8eb 100644 --- a/cmake/lzo.cmake +++ b/cmake/lzo.cmake @@ -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() |