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

Merge branch 'devel' of github.com:arangodb/arangodb into devel

This commit is contained in:
hkernbach 2016-02-25 23:50:26 +01:00
parent 335b638670 ca7651cc8d
commit 1fdea44cd3
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
3rdParty/OpenSSL/CMakeLists.txt vendored
View File

@ -28,3 +28,10 @@ set(OPENSSL_INCLUDE_DIR
"OpenSSL: Include Directory" "OpenSSL: Include Directory"
FORCE FORCE
) )
set(OPENSSL_LIBRARIES
"${OPENSSL_LIBRARIES}"
CACHE INTERNAL
"OpenSSL: Libraries Directory"
FORCE
)

3
3rdParty/V8/CMakeLists.txt vendored
View File

@ -91,6 +91,9 @@ else ()
endif () endif ()
endif() endif()
list(APPEND V8_COMPILE_ARGS icui18n icuuc icudata)
list(APPEND V8_COMPILE_ARGS v8)
ExternalProject_Add(v8_build ExternalProject_Add(v8_build
BUILD_IN_SOURCE TRUE BUILD_IN_SOURCE TRUE
SOURCE_DIR "${V8_DIR}" SOURCE_DIR "${V8_DIR}"

4
3rdParty/zlib/zlib-1.2.8/CMakeLists.txt vendored
View File

@ -241,11 +241,11 @@ endif()
include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}) include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
add_executable(example test/example.c) add_executable(example EXCLUDE_FROM_ALL test/example.c)
target_link_libraries(example zlib) target_link_libraries(example zlib)
add_test(example example) add_test(example example)
add_executable(minigzip test/minigzip.c) add_executable(minigzip EXCLUDE_FROM_ALL test/minigzip.c)
target_link_libraries(minigzip zlib) target_link_libraries(minigzip zlib)
if(HAVE_OFF64_T) if(HAVE_OFF64_T)

14
CMakeLists.txt
View File

@ -326,9 +326,8 @@ endif ()
include(VcMacros) include(VcMacros)
# we do not want to build specialized packages for one architecture include(OptimizeForArchitecture)
# include(OptimizeForArchitecture) OptimizeForArchitecture()
# OptimizeForArchitecture()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_ARCHITECTURE_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_ARCHITECTURE_FLAGS}")
@ -563,3 +562,12 @@ add_subdirectory(arangosh)
add_subdirectory(arangod) add_subdirectory(arangod)
add_subdirectory(UnitTests) add_subdirectory(UnitTests)
add_subdirectory(Documentation) add_subdirectory(Documentation)
add_dependencies(arangob zlibstatic v8_build)
add_dependencies(arangod ev zlibstatic v8_build)
add_dependencies(arangodump zlibstatic v8_build)
add_dependencies(arangoimp zlibstatic v8_build)
add_dependencies(arangorestore zlibstatic v8_build)
add_dependencies(arangosh zlibstatic v8_build)
add_dependencies(basics_suite v8_build)
add_dependencies(geo_suite v8_build)