[Commits] 621aeee: Fix rocksdb to build when bz2 library is present.

Sergei Petrunia psergey at askmonty.org
Fri Jul 11 22:02:42 EEST 2014


revision-id: 621aeee88274026050a8fde8a9464faccc38b35d
parent(s): c68808616e12d55fc4b9dfb6b34c53e15ff42818
committer: Sergei Petrunia
branch nick: webscalesql-5.6
timestamp: 2014-07-11 23:02:42 +0400
message:

Fix rocksdb to build when bz2 library is present.

-----------------------

 storage/rocksdb/CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt
index 3dbb922..ced0b96 100644
--- a/storage/rocksdb/CMakeLists.txt
+++ b/storage/rocksdb/CMakeLists.txt
@@ -34,7 +34,7 @@ SET(CMAKE_REQUIRED_INCLUDES ${Rocksdb_INCLUDE_DIRS})
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11")
 
 # TODO is there a better way to do this?
-LINK_LIBRARIES(snappy)
+#LINK_LIBRARIES(snappy bz2)
 
 CHECK_CXX_SOURCE_COMPILES(
 "
@@ -50,7 +50,7 @@ IF(ROCKSDB_OK)
       rdb_rowmods.cc rdb_rowmods.h
       rdb_applyiter.cc rdb_applyiter.h)
 
-  MYSQL_ADD_PLUGIN(rocksdb_se ${ROCKSDB_SOURCES} STORAGE_ENGINE STATIC_ONLY MANDATORY LINK_LIBRARIES ${LINK_DIR})
+  MYSQL_ADD_PLUGIN(rocksdb_se ${ROCKSDB_SOURCES} STORAGE_ENGINE STATIC_ONLY MANDATORY LINK_LIBRARIES ${LINK_DIR} snappy bz2)
 
   ADD_SUBDIRECTORY(unittest)
 ENDIF(ROCKSDB_OK)


More information about the commits mailing list