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

Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel

This commit is contained in:
Max Neunhoeffer 2016-02-26 10:12:13 +01:00
parent de745abce9 ec559aa3f3
commit e82d14b964
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -569,5 +569,8 @@ add_dependencies(arangodump zlibstatic v8_build)
add_dependencies(arangoimp zlibstatic v8_build) add_dependencies(arangoimp zlibstatic v8_build)
add_dependencies(arangorestore zlibstatic v8_build) add_dependencies(arangorestore zlibstatic v8_build)
add_dependencies(arangosh zlibstatic v8_build) add_dependencies(arangosh zlibstatic v8_build)
if (USE_BOOST_UNITTESTS)
add_dependencies(basics_suite v8_build) add_dependencies(basics_suite v8_build)
add_dependencies(geo_suite v8_build) add_dependencies(geo_suite v8_build)
endif ()

2
lib/Rest/Version.cpp
View File

@ -154,7 +154,7 @@ std::string Version::getV8Version() {
std::string Version::getOpenSSLVersion() { std::string Version::getOpenSSLVersion() {
#ifdef OPENSSL_VERSION_TEXT #ifdef OPENSSL_VERSION_TEXT
return std::string(OPENSSL_VERSION_TEXT); return std::string(OPENSSL_VERSION_TEXT);
#elif ARANGODB_OPENSSL_VERSION #elif defined(ARANGODB_OPENSSL_VERSION)
return std::string(ARANGODB_OPENSSL_VERSION); return std::string(ARANGODB_OPENSSL_VERSION);
#else #else
return std::string(""); return std::string("");