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

reduces warnings during build (#5131)

This commit is contained in:
Jan Christoph Uhde 2018-04-19 14:48:49 +02:00 committed by Jan
parent 74e7ed892c
commit bad4f2103a
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdParty/CMakeLists.txt vendored
View File

@ -232,7 +232,7 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/snappy/google-snappy-d53de18)
if (USE_JEMALLOC) if (USE_JEMALLOC)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/jemalloc) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/jemalloc)
include_directories("${JEMALLOC_HOME}/include") include_directories(SYSTEM "${JEMALLOC_HOME}/include")
link_directories("${JEMALLOC_HOME}/lib") link_directories("${JEMALLOC_HOME}/lib")
set(SYS_LIBS ${SYS_LIBS} ${JEMALLOC_LIB}) set(SYS_LIBS ${SYS_LIBS} ${JEMALLOC_LIB})
endif () endif ()

2
3rdParty/boost/CMakeLists.txt vendored
View File

@ -87,7 +87,7 @@ add_library(boost_locale STATIC
) )
add_dependencies(boost_locale v8_build) # for ICU libs add_dependencies(boost_locale v8_build) # for ICU libs
target_link_libraries(boost_locale PUBLIC boost_boost) #this will add required includes target_link_libraries(boost_locale PUBLIC boost_boost) #this will add required includes
target_include_directories(boost_locale PRIVATE ${ICU_INCLUDE_DIR}) target_include_directories(boost_locale SYSTEM PRIVATE ${ICU_INCLUDE_DIR})
target_compile_definitions(boost_locale PRIVATE "BOOST_SYSTEM_STATIC_LINK=1") target_compile_definitions(boost_locale PRIVATE "BOOST_SYSTEM_STATIC_LINK=1")
target_compile_definitions(boost_locale PUBLIC "BOOST_ALL_NO_LIB=1") target_compile_definitions(boost_locale PUBLIC "BOOST_ALL_NO_LIB=1")

18
CMakeLists.txt
View File

@ -436,12 +436,12 @@ endif ()
## INCLUDE DIRECTORIES ## INCLUDE DIRECTORIES
################################################################################ ################################################################################
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/linenoise-ng/include) include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/3rdParty/linenoise-ng/include)
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/linenoise-ng/src) include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/3rdParty/linenoise-ng/src)
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/velocypack/include) include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/3rdParty/velocypack/include)
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/rocksdb/v5.6.X/include) include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/3rdParty/rocksdb/v5.6.X/include)
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/rocksdb/v5.6.X) include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/3rdParty/rocksdb/v5.6.X)
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/date/include) include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/3rdParty/date/include)
include_directories(${PROJECT_BINARY_DIR}) include_directories(${PROJECT_BINARY_DIR})
@ -872,14 +872,14 @@ endif ()
## V8 ## V8
################################################################################ ################################################################################
include_directories(${V8_INCLUDE_DIR}) include_directories(SYSTEM ${V8_INCLUDE_DIR})
add_definitions("-DARANGODB_V8_VERSION=\"${V8_VERSION}\"") add_definitions("-DARANGODB_V8_VERSION=\"${V8_VERSION}\"")
################################################################################ ################################################################################
## ZLIB ## ZLIB
################################################################################ ################################################################################
include_directories(${ZLIB_INCLUDE_DIR}) include_directories(SYSTEM ${ZLIB_INCLUDE_DIR})
add_definitions("-DARANGODB_ZLIB_VERSION=\"${ZLIB_VERSION}\"") add_definitions("-DARANGODB_ZLIB_VERSION=\"${ZLIB_VERSION}\"")
################################################################################ ################################################################################
@ -888,7 +888,7 @@ add_definitions("-DARANGODB_ZLIB_VERSION=\"${ZLIB_VERSION}\"")
# This does not belong here! it should be handled in 3rdParty! # This does not belong here! it should be handled in 3rdParty!
add_definitions(-DCURL_STATICLIB=1) add_definitions(-DCURL_STATICLIB=1)
include_directories( include_directories(SYSTEM
${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/curl/curl-7.57.0/include/ ${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/curl/curl-7.57.0/include/
${CMAKE_CURRENT_BINARY_DIR}/3rdParty/curl/curl-7.57.0/include/curl/ ${CMAKE_CURRENT_BINARY_DIR}/3rdParty/curl/curl-7.57.0/include/curl/
) )