8000 ROCKSDB uses static snappy from 3rdparty · gauravkumar37/arangodb@64a567a · GitHub
[go: up one dir, main page]
Skip to content

Commit 64a567a

Browse files
author
Andreas Streichardt
committed
ROCKSDB uses static snappy from 3rdparty
1 parent 65902af commit 64a567a

File tree

6 files changed

+12
-41
lines changed

6 files changed

+12
-41
lines changed

‎3rdParty/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zlib-1.2.8)
9393
## SNAPPY
9494
################################################################################
9595

96-
set(SKIP_INSTALL_ALL ON)
97-
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/snappy/google-snappy-d53de18)
9896

9997
################################################################################
10098
## ROCKSDB
@@ -104,6 +102,8 @@ if (USE_ROCKSDB)
104102
if (${JEMALLOC_FOUND})
105103
# set(USE_JEMALLOC_DEFAULT 1)
106104
endif()
105+
set(SKIP_INSTALL_ALL ON)
106+
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/snappy/google-snappy-d53de18)
107107
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/rocksdb/)
108108
endif ()
109109

‎3rdParty/rocksdb/rocksdb/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
cmake_minimum_required(VERSION 2.6)
3030
project(rocksdb)
3131

32+
SET(SNAPPY 1)
3233
include(${CMAKE_CURRENT_SOURCE_DIR}/thirdparty.inc)
3334
IF (WIN32)
3435
execute_process(COMMAND powershell -Command "Get-Date -format MM_dd_yyyy" OUTPUT_VARIABLE DATE)

‎3rdParty/rocksdb/rocksdb/thirdparty.inc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#
44
# Edit these lines to set defaults for use of external libraries
55
#
6+
67
if (NOT "${USE_GFLAGS_DEFAULT}")
78
set(USE_GFLAGS_DEFAULT 0) # GFLAGS is disabled by default, enable with -DGFLAGS=1 cmake command line agrument
89
endif()
@@ -85,10 +86,11 @@ endif ()
8586
#
8687
# Edit these 4 lines to define paths to Snappy
8788
#
88-
set(SNAPPY_HOME $ENV{THIRDPARTY_HOME}/Snappy.Library)
89-
set(SNAPPY_INCLUDE ${SNAPPY_HOME}/inc/inc)
90-
set(SNAPPY_LIB_DEBUG ${SNAPPY_HOME}/bin/debug/amd64/snappy.lib)
91-
set(SNAPPY_LIB_RELEASE ${SNAPPY_HOME}/bin/retail/amd64/snappy.lib)
89+
set(SNAPPY_HOME ${CMAKE_SOURCE_DIR}/3rdParty/snappy/google-snappy-d53de18/)
90+
set(SNAPPY_INCLUDE ${SNAPPY_HOME})
91+
list(APPEND SNAPPY_INCLUDE ${CMAKE_BINARY_DIR}/3rdParty/snappy/google-snappy-d53de18/)
92+
set(SNAPPY_LIB_DEBUG snappystatic)
93+
set(SNAPPY_LIB_RELEASE snappystatic)
9294

9395
#
9496
# Don't touch these lines

‎3rdParty/snappy/google-snappy-d53de18/CMakeLists.txt

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -148,30 +148,3 @@ set(SNAPPY_SRCS
148148
)
149149

150150
add_library(snappystatic STATIC ${SNAPPY_SRCS} ${SNAPPY_PUBLIC_HDRS} ${SNAPPY_PRIVATE_HDRS})
151-
152-
153-
if (WINDOWS)
154-
set(SNAPPY_LIBS
155-
snappystatic
156-
CACHE INTERNAL
157-
"${PROJECT_NAME}: Libraries"
158-
)
159-
160-
list(APPEND LINK_DIRECTORIES "${snappystatic_BINARY_DIR}")
161-
else ()
162-
set(SNAPPY_LIBS
163-
snappystatic
164-
CACHE INTERNAL
165-
"${PROJECT_NAME}: Libraries"
166-
)
167-
168-
list(APPEND LINK_DIRECTORIES "${snappystatic_BINARY_DIR}")
169-
endif ()
170-
171-
set(SNAPPY_INCLUDE_DIR
172-
${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}
173-
CACHE INTERNAL
174-
"${PROJECT_NAME}: Include Directories"
175-
)
176-
177-
set(LINK_DIRECTORIES "${LINK_DIRECTORIES}" PARENT_SCOPE)

‎CMakeLists.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,11 @@ option(USE_ROCKSDB
155155

156156
if (USE_ROCKSDB)
157157
add_definitions("-DARANGODB_ENABLE_ROCKSDB=1")
158+
else ()
159+
set(ROCKSDB_LIBS "")
158160
endif ()
159161

162+
160163
################################################################################
161164
## EXTERNAL PROGRAMS
162165
################################################################################
@@ -167,13 +170,6 @@ else ()
167170
set(MAKE make)
168171
endif ()
169172

170-
if (USE_ROCKSDB)
171-
find_package(Snappy)
172-
else ()
173-
set(SNAPPY_STATIC_LIB "")
174-
set(ROCKSDB_LIBS "")
175-
endif ()
176-
177173
find_package(PythonInterp 2 REQUIRED)
178174
get_filename_component(PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}" REALPATH)
179175

‎arangod/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@ target_link_libraries(${BIN_ARANGOD}
331331
${MSVC_LIBS}
332332
${V8_LIBS}
333333
${ROCKSDB_LIBS}
334-
${SNAPPY_STATIC_LIB}
335334
${SYSTEM_LIBRARIES}
336335
)
337336

0 commit comments

Comments
 (0)
0