mirror of https://gitee.com/bigwinds/arangodb
cleanup includes, fixed typo
This commit is contained in:
parent
2a3ee1f9a4
commit
daef04b799
|
@ -151,6 +151,18 @@ if (NOT GO_FOUND)
|
||||||
message("Go version >=1.2 not found. etcd will not be built.")
|
message("Go version >=1.2 not found. etcd will not be built.")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
################################################################################
|
||||||
|
## ARCHITECTURE
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
if (SOLARIS)
|
||||||
|
set(CMAKE_SIZEOF_VOID_P 8)
|
||||||
|
set(CMAKE_CXX_SIZEOF_DATA_PTR 8)
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
math(EXPR BITS "8*${CMAKE_SIZEOF_VOID_P}")
|
||||||
|
add_definitions("-DARANGODB_BITS=${BITS}")
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
## COMPILER FEATURES
|
## COMPILER FEATURES
|
||||||
################################################################################
|
################################################################################
|
||||||
|
@ -239,6 +251,10 @@ if (MSVC)
|
||||||
)
|
)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
################################################################################
|
||||||
|
## INCLUDE DIRECTORIES
|
||||||
|
################################################################################
|
||||||
|
|
||||||
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/linenoise-ng/include)
|
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/linenoise-ng/include)
|
||||||
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/linenoise-ng/src)
|
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/linenoise-ng/src)
|
||||||
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/velocypack/include)
|
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/velocypack/include)
|
||||||
|
@ -255,36 +271,6 @@ if (CUSTOM_INCLUDES)
|
||||||
include_directories(${CUSTOM_INCLUDES})
|
include_directories(${CUSTOM_INCLUDES})
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (MSVC)
|
|
||||||
set(MSVC_INCLUDE
|
|
||||||
${PROJECT_SOURCE_DIR}/WindowsLibraries/${BITS}/include
|
|
||||||
CACHE path
|
|
||||||
"MSVC 3rd party include path"
|
|
||||||
)
|
|
||||||
|
|
||||||
include_directories(${MSVC_INCLUDE})
|
|
||||||
|
|
||||||
set(MSVC_LIB_PATH
|
|
||||||
${PROJECT_SOURCE_DIR}/WindowsLibraries/${BITS}/lib
|
|
||||||
CACHE path
|
|
||||||
"MSVC 3rd party library path"
|
|
||||||
)
|
|
||||||
|
|
||||||
link_directories(${MSVC_LIB_PATH})
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
## ARCHITECTURE
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
if (SOLARIS)
|
|
||||||
set(CMAKE_SIZEOF_VOID_P 8)
|
|
||||||
set(CMAKE_CXX_SIZEOF_DATA_PTR 8)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
math(EXPR BITS "8*${CMAKE_SIZEOF_VOID_P}")
|
|
||||||
add_definitions("-DARANGODB_BITS=${BITS}")
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# BUILD TYPES
|
# BUILD TYPES
|
||||||
################################################################################
|
################################################################################
|
||||||
|
@ -485,7 +471,7 @@ add_definitions("-DARANGODB_LIBEV_VERSION=\"${LIBEV_VERSION}\"")
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
include_directories(${OPENSSL_INCLUDE_DIR})
|
include_directories(${OPENSSL_INCLUDE_DIR})
|
||||||
add_definitions(-DARANGODB_OPENSSL_VERSION=\"${BOOST_VERSION}\")
|
add_definitions(-DARANGODB_OPENSSL_VERSION=\"${OPENSSL_VERSION}\")
|
||||||
|
|
||||||
if (USE_OPENSSL_NO_SSL2)
|
if (USE_OPENSSL_NO_SSL2)
|
||||||
add_definitions(-DOPENSSL_NO_SSL2)
|
add_definitions(-DOPENSSL_NO_SSL2)
|
||||||
|
|
Loading…
Reference in New Issue