[Commits] Rev 4875: Fix rocksdb to build when bz2 library is present. in file:///home/psergey/chroot/saucy-x64/home/psergey/dev2/mysql-5.6-rocksdb-r2/

Sergey Petrunya psergey at askmonty.org
Fri Jul 11 19:17:10 EEST 2014


At file:///home/psergey/chroot/saucy-x64/home/psergey/dev2/mysql-5.6-rocksdb-r2/

------------------------------------------------------------
revno: 4875
revision-id: psergey at askmonty.org-20140711161708-b50tdmlr60djrror
parent: mdcallag at gmail.com-20140709234624-rvgq2vhux0x36nf5
committer: Sergey Petrunya <psergey at askmonty.org>
branch nick: mysql-5.6-rocksdb-r2
timestamp: Fri 2014-07-11 20:17:08 +0400
message:
  Fix rocksdb to build when bz2 library is present.
=== modified file 'storage/rocksdb/CMakeLists.txt'
--- a/storage/rocksdb/CMakeLists.txt	2014-07-03 20:58:25 +0000
+++ b/storage/rocksdb/CMakeLists.txt	2014-07-11 16:17:08 +0000
@@ -34,7 +34,7 @@ SET(CMAKE_REQUIRED_INCLUDES ${Rocksdb_IN
 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