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

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

This commit is contained in:
Jan Steemann 2015-07-20 10:59:22 +02:00
parent 118fd54fd0 ee398569d7
commit 842fcf44d6
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arangosh/CMakeLists.txt
View File

@ -23,7 +23,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
if (MSVC) if (MSVC)
generate_product_version( generate_product_version(
ProductVersionFiles ProductVersionFiles_arangob
NAME ${ARANGOB_FRIENDLY_STRING} NAME ${ARANGOB_FRIENDLY_STRING}
ICON ${ARANGO_ICON} ICON ${ARANGO_ICON}
VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR} VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}
@ -35,7 +35,7 @@ endif ()
add_executable( add_executable(
${BIN_ARANGOB} ${BIN_ARANGOB}
${ProductVersionFiles} ${ProductVersionFiles_arangob}
ArangoShell/ArangoClient.cpp ArangoShell/ArangoClient.cpp
Benchmark/arangob.cpp Benchmark/arangob.cpp
) )
@ -72,8 +72,8 @@ install_config(arangob)
if (MSVC) if (MSVC)
generate_product_version( generate_product_version(
ProductVersionFiles ProductVersionFiles_arangodump
NAME ARANGO_DUMP_FRIENDLY_STRING NAME ${ARANGO_DUMP_FRIENDLY_STRING}
ICON ${ARANGO_ICON} ICON ${ARANGO_ICON}
VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR} VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}
VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR} VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}
@ -84,7 +84,7 @@ endif ()
add_executable( add_executable(
${BIN_ARANGODUMP} ${BIN_ARANGODUMP}
${ProductVersionFiles} ${ProductVersionFiles_arangodump}
ArangoShell/ArangoClient.cpp ArangoShell/ArangoClient.cpp
V8Client/arangodump.cpp V8Client/arangodump.cpp
) )
@ -121,8 +121,8 @@ install_config(arangodump)
if (MSVC) if (MSVC)
generate_product_version( generate_product_version(
ProductVersionFiles ProductVersionFiles_arangoimp
NAME ARANGO_IMP_FRIENDLY_STRING NAME ${ARANGO_IMP_FRIENDLY_STRING}
ICON ${ARANGO_ICON} ICON ${ARANGO_ICON}
VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR} VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}
VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR} VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}
@ -133,7 +133,7 @@ endif ()
add_executable( add_executable(
${BIN_ARANGOIMP} ${BIN_ARANGOIMP}
${ProductVersionFiles} ${ProductVersionFiles_arangoimp}
ArangoShell/ArangoClient.cpp ArangoShell/ArangoClient.cpp
V8Client/ImportHelper.cpp V8Client/ImportHelper.cpp
V8Client/arangoimp.cpp V8Client/arangoimp.cpp
@ -171,8 +171,8 @@ install_config(arangoimp)
if (MSVC) if (MSVC)
generate_product_version( generate_product_version(
ProductVersionFiles ProductVersionFiles_arangorestore
NAME ARANGO_RESTORE_HELP_LINK NAME ${ARANGO_RESTORE_HELP_LINK}
ICON ${ARANGO_ICON} ICON ${ARANGO_ICON}
VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR} VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}
VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR} VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}
@ -182,7 +182,7 @@ if (MSVC)
endif () endif ()
add_executable( add_executable(
${BIN_ARANGORESTORE} ${BIN_ARANGORESTORE}
${ProductVersionFiles} ${ProductVersionFiles_arangorestore}
ArangoShell/ArangoClient.cpp ArangoShell/ArangoClient.cpp
V8Client/arangorestore.cpp V8Client/arangorestore.cpp
) )
@ -219,8 +219,8 @@ install_config(arangorestore)
if (MSVC) if (MSVC)
generate_product_version( generate_product_version(
ProductVersionFiles ProductVersionFiles_arangosh
NAME ARANGOSH_HELP_LINK NAME ${ARANGOSH_HELP_LINK}
ICON ${ARANGO_ICON} ICON ${ARANGO_ICON}
VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR} VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}
VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR} VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}
@ -230,7 +230,7 @@ if (MSVC)
endif () endif ()
add_executable( add_executable(
${BIN_ARANGOSH} ${BIN_ARANGOSH}
${ProductVersionFiles} ${ProductVersionFiles_arangosh}
ArangoShell/ArangoClient.cpp ArangoShell/ArangoClient.cpp
V8Client/ImportHelper.cpp V8Client/ImportHelper.cpp
V8Client/V8ClientConnection.cpp V8Client/V8ClientConnection.cpp