Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed order so that asan flags are passed to snappy

This commit is contained in:
Frank Celler 2017-05-29 11:52:26 +02:00
parent 4b61f5b8bb
commit fc11c3ee8d
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
CMakeLists.txt
View File

@ -590,10 +590,9 @@ if (USE_JEMALLOC)
endif () endif ()
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# RocksDB # NDEBUG
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
#NDEBUG
if ( NOT USE_MAINTAINER_MODE AND ( CMAKE_BUILD_TYPE STREQUAL "Release" OR if ( NOT USE_MAINTAINER_MODE AND ( CMAKE_BUILD_TYPE STREQUAL "Release" OR
CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo" OR
CMAKE_BUILD_TYPE STREQUAL "MinSizeRel" CMAKE_BUILD_TYPE STREQUAL "MinSizeRel"
@ -602,21 +601,6 @@ if ( NOT USE_MAINTAINER_MODE AND ( CMAKE_BUILD_TYPE STREQUAL "Release" OR
add_definitions(-DNDEBUG) add_definitions(-DNDEBUG)
endif () endif ()
add_subdirectory(3rdParty/rocksdb)
add_definitions(-DARANGODB_ROCKSDB_VERSION=\"${ROCKSDB_VERSION}\")
include_directories(${ROCKSDB_INCLUDE_DIR})
set(ROCKSDB_LIBS rocksdblib;snappystatic)
add_dependencies(rocksdblib snappystatic)
if (USE_JEMALLOC)
add_dependencies(rocksdblib jemalloc)
endif ()
################################################################################ ################################################################################
## FLAGS ## FLAGS
################################################################################ ################################################################################
@ -741,6 +725,23 @@ if(ARANGODB_DEBUG_CMAKE)
message( STATUS "DirDefs: ${DirDefs}" ) message( STATUS "DirDefs: ${DirDefs}" )
endif() endif()
# ------------------------------------------------------------------------------
# RocksDB
# ------------------------------------------------------------------------------
add_subdirectory(3rdParty/rocksdb)
add_definitions(-DARANGODB_ROCKSDB_VERSION=\"${ROCKSDB_VERSION}\")
include_directories(${ROCKSDB_INCLUDE_DIR})
set(ROCKSDB_LIBS rocksdblib;snappystatic)
add_dependencies(rocksdblib snappystatic)
if (USE_JEMALLOC)
add_dependencies(rocksdblib jemalloc)
endif ()
################################################################################ ################################################################################
## 3RD PARTY ## 3RD PARTY
################################################################################ ################################################################################