Skip to content

Commit e2654fd

Browse files
committed
Remove Snappy from CMakeLists
1 parent 42eb53d commit e2654fd

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

CMakeLists.txt

+5-12
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
33
if(NOT QDB_VERSION)
44

55
# not included from the marvellous qdb
6-
project(leveldb)
6+
project(leveldb)
77
set(CMAKE_DEBUG_POSTFIX "d")
88
set(QDB_DEBUG_POSTFIX "d")
99
set(QDB_RELEASE_POSTFIX "")
@@ -35,14 +35,12 @@ if(NOT QDB_VERSION)
3535

3636
set(Boost_ADDITIONAL_VERSIONS)
3737

38-
find_package(Boost COMPONENTS
38+
find_package(Boost COMPONENTS
3939
date_time
4040
filesystem
4141
system
4242
REQUIRED)
4343

44-
set(SNAPPY_LIBRARY "")
45-
4644
string(REGEX MATCH "clang" CLANG ${CMAKE_CXX_COMPILER})
4745

4846
if(CMAKE_COMPILER_IS_GNUCXX OR CLANG)
@@ -56,14 +54,11 @@ if(NOT QDB_VERSION)
5654
set(Stdcpp_LIBRARY "")
5755
endif(CMAKE_COMPILER_IS_GNUCXX OR CLANG)
5856

59-
else(NOT QDB_VERSION)
60-
set(SNAPPY_LIBRARY "snappy")
6157
endif(NOT QDB_VERSION)
6258

6359
include_directories(${Boost_INCLUDE_DIRS}
6460
${CMAKE_CURRENT_SOURCE_DIR}
65-
include
66-
${SNAPPY_INCLUDE_DIRS})
61+
include)
6762

6863
if(MSVC)
6964
add_compile_options(
@@ -79,7 +74,6 @@ endif(MSVC)
7974

8075
add_definitions(
8176
-DLEVELDB_ATOMIC_PRESENT
82-
-DSNAPPY
8377
)
8478

8579
set(LEVEL_DB_FILES
@@ -188,7 +182,6 @@ endif(QDB_VERSION)
188182
add_library(leveldb ${LEVEL_DB_FILES})
189183

190184
target_link_libraries(leveldb
191-
${SNAPPY_LIBRARY}
192185
${Boost_LIBRARIES}
193186
${Pthread_LIBRARY}
194187
)
@@ -211,7 +204,7 @@ install(TARGETS leveldbutil
211204
##################################### TESTS #######################################
212205
# Every leveldb test file has to be compiled as an independant binary
213206
# because of the test framework used by leveldb.
214-
add_library(leveldb_test_rt
207+
add_library(leveldb_test_rt
215208
util/testutil.h
216209
util/testutil.cc
217210
util/testharness.h
@@ -261,4 +254,4 @@ LEVELDB_ADD_TEST(db_bench db/db_bench.cc)
261254
LEVELDB_ADD_TEST(version_set db/version_set_test.cc)
262255
LEVELDB_ADD_TEST(filter_block table/filter_block_test.cc)
263256
LEVELDB_ADD_TEST(bloom util/bloom_test.cc)
264-
LEVELDB_ADD_TEST(hash util/hash_test.cc)
257+
LEVELDB_ADD_TEST(hash util/hash_test.cc)

0 commit comments

Comments
 (0)