KEP-564 Add RocksDB to build

* more travis fixes
bluzelle · Aug 29, 2018 · 5939653 · 5939653
1 parent 63159a0
commit 5939653
Showing 1 changed file with 19 additions and 26 deletions.
diff --git a/cmake/rocksdb.cmake b/cmake/rocksdb.cmake
@@ -21,35 +21,28 @@ mark_as_advanced(
     SNAPPY_LIBRARIES
     SNAPPY_INCLUDE_DIR)
 
-#find_package(Snappy REQUIRED)
+# find bzip2...
+#if (APPLE)
+    #find_package(Bzip2 REQUIRED)
+#else()
+    find_path(BZIP2_INCLUDE_DIR
+        NAMES bzlib.h
+        HINTS ${BZIP2_ROOT_DIR}/include)
 
-if (APPLE)
-    find_package(Bzip2 REQUIRED)
-else()
-#    find_path(BZIP2_INCLUDE_DIR
-#        NAMES bzlib.h
-#        HINTS ${BZIP2_ROOT_DIR}/include)
-#
-#    find_library(BZIP2_LIBRARIES
-#        NAMES bz2
-#        HINTS ${BZIP2_ROOT_DIR}/lib)
-#
-#    include(FindPackageHandleStandardArgs)
-#    find_package_handle_standard_args(Bzip2 DEFAULT_MSG
-#        BZIP2_LIBRARIES
-#        BZIP2_INCLUDE_DIR)
-#
-#    mark_as_advanced(
-#        BZIP2_ROOT_DIR
-#        BZIP2_LIBRARIES
-#        BZIP2_INCLUDE_DIR)
+    find_library(BZIP2_LIBRARIES
+        NAMES bz2
+        HINTS ${BZIP2_ROOT_DIR}/lib)
 
-    #find_package(Bzip2)
-
-    set(BZIP2_LIBRARIES "bz2")
-
-endif()
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(Bzip2 DEFAULT_MSG
+        BZIP2_LIBRARIES
+        BZIP2_INCLUDE_DIR)
 
+    mark_as_advanced(
+        BZIP2_ROOT_DIR
+        BZIP2_LIBRARIES
+        BZIP2_INCLUDE_DIR)
+#endif()
 
 ProcessorCount(N)
 if(NOT N EQUAL 0)