1
0
Fork 0

cleanup of unsed variables

This commit is contained in:
Frank Celler 2016-02-23 11:33:16 +01:00
parent 7a84881148
commit 5b0d9e2ef6
3 changed files with 165 additions and 190 deletions

View File

@ -1,9 +1,13 @@
# -*- mode: CMAKE; -*-
# ------------------------------------------------------------------------------
# General
# ------------------------------------------------------------------------------
cmake_minimum_required(VERSION 2.8)
project(ArangoDB)
if (APPLE)
if (NOT DEFINED CMAKE_C_COMPILER)
set(CMAKE_C_COMPILER /usr/bin/clang)
@ -14,16 +18,24 @@ if (APPLE)
endif ()
endif ()
project(ArangoDB)
if (POLICY CMP0037)
cmake_policy(SET CMP0037 NEW)
endif ()
if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RelWithDebInfo
CACHE string
"Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
FORCE
)
endif ()
set(ARANGODB_DISPLAY_NAME "ArangoDB")
set(ARANGODB_URL_INFO_ABOUT "http://www.arangodb.org")
set(ARANGODB_CONTACT "hackers@arangodb.org")
# where to find CMAKE modules
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
################################################################################
## ARANGODB
################################################################################
set(ARANGODB_VERSION_MAJOR "3")
set(ARANGODB_VERSION_MINOR "0")
@ -32,6 +44,23 @@ set(ARANGODB_VERSION_REVISION "0-devel")
set(ARANGODB_VERSION
"${ARANGODB_VERSION_MAJOR}.${ARANGODB_VERSION_MINOR}.${ARANGODB_VERSION_REVISION}")
# for NSIS
set(ARANGODB_DISPLAY_NAME "ArangoDB")
set(ARANGODB_URL_INFO_ABOUT "https://www.arangodb.com")
set(ARANGODB_CONTACT "hackers@arangodb.com")
set(ARANGODB_FRIENDLY_STRING "ArangoDB - the multi-model database")
# MSVC
set(ARANGOB_FRIENDLY_STRING "arangob - stress test program")
set(ARANGO_DUMP_FRIENDLY_STRING "arangodump - export")
set(ARANGO_RESTORE_FRIENDLY_STRING "arangrestore - importer")
set(ARANGO_IMP_FRIENDLY_STRING "arangoimp - TSV/CSV/JSON importer")
set(ARANGOSH_FRIENDLY_STRING "arangosh - commandline client")
################################################################################
## VERSION FILES
################################################################################
configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}/lib/Basics/build.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/lib/Basics/build.h")
@ -40,28 +69,18 @@ configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}/lib/Basics/VERSION.in"
"${CMAKE_CURRENT_SOURCE_DIR}/VERSION")
set(ARANGODB_FRIENDLY_STRING "ArangoDB - the multi-model database")
set(ARANGOB_FRIENDLY_STRING "ArangoBench - stresstester")
set(ARANGO_DUMP_FRIENDLY_STRING
"arangodump - export whole databases from ArangoDB to JSON")
set(ARANGO_IMP_FRIENDLY_STRING "arangoimp - import CSV files into ArangoDB")
set(ARANGO_RESTORE_HELP_LINK
"arangrestore - import dumpfiles created with arangodump into ArangoDB")
set(ARANGOSH_HELP_LINK "arangosh - commandline client of ArangoDB")
if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE string
"Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
FORCE)
endif ()
# Where 2 find CMAKE modules
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
################################################################################
## COMPILER FEATURES
################################################################################
# ArangoDB needs c++11
set(CMAKE_CXX_STANDARD 11)
include (CheckCXX11Features)
################################################################################
## COMPILER FEATURES
################################################################################
# Need threads
find_package(Threads REQUIRED)

View File

@ -191,7 +191,7 @@ if (MSVC)
generate_product_version(
ProductVersionFiles_arangorestore
NAME arangorestore
FILE_DESCRIPTION ${ARANGO_RESTORE_HELP_LINK}
FILE_DESCRIPTION ${ARANGO_RESTORE_FRIENDLY_STRING}
ICON ${ARANGO_ICON}
VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}
VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}
@ -245,7 +245,7 @@ if (MSVC)
generate_product_version(
ProductVersionFiles_arangosh
NAME arangosh
FILE_DESCRIPTION ${ARANGOSH_HELP_LINK}
FILE_DESCRIPTION ${ARANGOSH_FRIENDLY_STRING}
ICON ${ARANGO_ICON}
VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}
VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}

View File

@ -1,58 +1,45 @@
# -*- mode: CMAKE; -*-
## -----------------------------------------------------------------------------
## --SECTION-- COMMON INCLUDES
## -----------------------------------------------------------------------------
include_directories(.)
## -----------------------------------------------------------------------------
## --SECTION-- LIBRARIES
## -----------------------------------------------------------------------------
include_directories(${ICU_INCLUDE_DIR})
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/boost/1.58.0)
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/linenoise-ng/include)
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/linenoise-ng/src)
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/velocypack/include)
include_directories(${V8_INCLUDE_DIR})
################################################################################
### @brief LIB_ARANGO
## LIB_ARANGO
################################################################################
if (MSVC)
SET(LIB_ARANGO_MSVC
Basics/locks-win32.cpp
Basics/memory-map-win32.cpp
Basics/terminal-utils-win32.cpp
Basics/threads-win32.cpp
Basics/win-utils.cpp
Zip/iowin32.cpp
set(LIB_ARANGO_MSVC
Basics/locks-win32.cpp
Basics/memory-map-win32.cpp
Basics/terminal-utils-win32.cpp
Basics/threads-win32.cpp
Basics/win-utils.cpp
Zip/iowin32.cpp
)
else ()
SET(LIB_ARANGO_POSIX
Basics/locks-posix.cpp
Basics/memory-map-posix.cpp
Basics/terminal-utils-posix.cpp
Basics/threads-posix.cpp
Rest/EndpointUnixDomain.cpp
set(LIB_ARANGO_POSIX
Basics/locks-posix.cpp
Basics/memory-map-posix.cpp
Basics/terminal-utils-posix.cpp
Basics/threads-posix.cpp
Rest/EndpointUnixDomain.cpp
)
endif ()
# Find includes in corresponding build directories
# set(CMAKE_INCLUDE_CURRENT_DIR ON) # <- now done via include_directories in main file
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/linenoise-ng/include)
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/linenoise-ng/src)
include_directories(${V8_INCLUDE_DIR})
include_directories(${ICU_INCLUDE_DIR})
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/boost/1.58.0)
SET(LIB_ARANGO_CONSOLE
set(LIB_ARANGO_CONSOLE
${PROJECT_SOURCE_DIR}/3rdParty/linenoise-ng/src/ConvertUTF.cpp
${PROJECT_SOURCE_DIR}/3rdParty/linenoise-ng/src/linenoise.cpp
${PROJECT_SOURCE_DIR}/3rdParty/linenoise-ng/src/wcwidth.cpp
Utilities/LinenoiseShell.cpp
)
include_directories(${PROJECT_SOURCE_DIR}/3rdParty/velocypack/include)
SET(LIB_ARANGO_VPACK
set(LIB_ARANGO_VPACK
${PROJECT_SOURCE_DIR}/3rdParty/velocypack/src/AttributeTranslator.cpp
${PROJECT_SOURCE_DIR}/3rdParty/velocypack/src/Builder.cpp
${PROJECT_SOURCE_DIR}/3rdParty/velocypack/src/Collection.cpp
@ -71,137 +58,106 @@ SET(LIB_ARANGO_VPACK
${PROJECT_SOURCE_DIR}/3rdParty/velocypack/src/velocypack-common.cpp
)
add_library(
${LIB_ARANGO}
STATIC
${LIB_ARANGO_APPLE}
${LIB_ARANGO_MSVC}
${LIB_ARANGO_POSIX}
${LIB_ARANGO_CONSOLE}
${LIB_ARANGO_VPACK}
Basics/application-exit.cpp
Basics/associative.cpp
Basics/AttributeNameParser.cpp
Basics/Barrier.cpp
Basics/ConditionLocker.cpp
Basics/ConditionVariable.cpp
Basics/conversions.cpp
Basics/csv.cpp
Basics/DataProtector.cpp
Basics/Exceptions.cpp
Basics/FileUtils.cpp
Basics/InitializeBasics.cpp
Basics/JsonHelper.cpp
Basics/Logger.cpp
Basics/Mutex.cpp
Basics/MutexLocker.cpp
Basics/Nonce.cpp
Basics/debugging.cpp
Basics/error.cpp
Basics/fasthash.cpp
Basics/files.cpp
Basics/fpconv.cpp
Basics/hashes.cpp
Basics/init.cpp
Basics/json-utilities.cpp
Basics/json.cpp
Basics/levenshtein.cpp
Basics/memory.cpp
Basics/mimetypes.cpp
Basics/prime-numbers.cpp
Basics/process-utils.cpp
Basics/ProgramOptions.cpp
Basics/ProgramOptionsDescription.cpp
Basics/random.cpp
Basics/RandomGenerator.cpp
Basics/ReadWriteLock.cpp
Basics/ReadWriteLockCPP11.cpp
Basics/socket-utils.cpp
Basics/ssl-helper.cpp
Basics/StringBuffer.cpp
Basics/StringUtils.cpp
Basics/structures.cpp
Basics/system-functions.cpp
Basics/terminal-utils.cpp
Basics/Thread.cpp
Basics/ThreadPool.cpp
Basics/tri-strings.cpp
Basics/tri-zip.cpp
Basics/Utf8Helper.cpp
Basics/vector.cpp
Basics/VelocyPackHelper.cpp
Basics/voc-errors.cpp
Basics/voc-mimetypes.cpp
Basics/VPackStringBufferAdapter.cpp
Basics/WorkMonitor.cpp
JsonParser/json-parser.cpp
ProgramOptions/program-options.cpp
Rest/EndpointList.cpp
Rest/Endpoint.cpp
Rest/EndpointIp.cpp
Rest/EndpointIpV4.cpp
Rest/EndpointIpV6.cpp
Rest/HttpRequest.cpp
Rest/HttpResponse.cpp
Rest/InitializeRest.cpp
Rest/SslInterface.cpp
Rest/Version.cpp
Utilities/LineEditor.cpp
Utilities/ScriptLoader.cpp
Utilities/ShellBase.cpp
Zip/ioapi.cpp
Zip/unzip.cpp
Zip/zip.cpp
)
target_link_libraries(${LIB_ARANGO} ${AR_V8_LIBS} ${AR_ICU_LIBS} )
################################################################################
### @brief LIB_ARANGO_CLIENT
################################################################################
add_library(
${LIB_ARANGO_CLIENT}
STATIC
SimpleHttpClient/GeneralClientConnection.cpp
SimpleHttpClient/ClientConnection.cpp
SimpleHttpClient/ConnectionManager.cpp
SimpleHttpClient/SslClientConnection.cpp
SimpleHttpClient/SimpleHttpClient.cpp
SimpleHttpClient/SimpleHttpResult.cpp
)
target_link_libraries(${LIB_ARANGO_CLIENT} ${AR_V8_LIBS} ${AR_ICU_LIBS} )
################################################################################
### @brief LIB_ARANGO_V8
################################################################################
add_library(
${LIB_ARANGO_V8}
STATIC
V8/JSLoader.cpp
V8/V8LineEditor.cpp
V8/v8-buffer.cpp
V8/v8-conv.cpp
V8/v8-globals.cpp
V8/v8-json.cpp
V8/v8-shell.cpp
V8/v8-utils.cpp
V8/v8-vpack.cpp
V8/v8-environment.cpp
SimpleHttpClient/GeneralClientConnection.cpp
SimpleHttpClient/ClientConnection.cpp
SimpleHttpClient/ConnectionManager.cpp
SimpleHttpClient/SslClientConnection.cpp
SimpleHttpClient/SimpleHttpClient.cpp
SimpleHttpClient/SimpleHttpResult.cpp
add_library(${LIB_ARANGO} STATIC
${LIB_ARANGO_APPLE}
${LIB_ARANGO_MSVC}
${LIB_ARANGO_POSIX}
${LIB_ARANGO_CONSOLE}
${LIB_ARANGO_VPACK}
Basics/AttributeNameParser.cpp
Basics/Barrier.cpp
Basics/ConditionLocker.cpp
Basics/ConditionVariable.cpp
Basics/DataProtector.cpp
Basics/Exceptions.cpp
Basics/FileUtils.cpp
Basics/InitializeBasics.cpp
Basics/JsonHelper.cpp
Basics/Logger.cpp
Basics/Mutex.cpp
Basics/MutexLocker.cpp
Basics/Nonce.cpp
Basics/ProgramOptions.cpp
Basics/ProgramOptionsDescription.cpp
Basics/RandomGenerator.cpp
Basics/ReadWriteLock.cpp
Basics/ReadWriteLockCPP11.cpp
Basics/StringBuffer.cpp
Basics/StringUtils.cpp
Basics/Thread.cpp
Basics/ThreadPool.cpp
Basics/Utf8Helper.cpp
Basics/VPackStringBufferAdapter.cpp
Basics/VelocyPackHelper.cpp
Basics/WorkMonitor.cpp
Basics/application-exit.cpp
Basics/associative.cpp
Basics/conversions.cpp
Basics/csv.cpp
Basics/debugging.cpp
Basics/error.cpp
Basics/fasthash.cpp
Basics/files.cpp
Basics/fpconv.cpp
Basics/hashes.cpp
Basics/init.cpp
Basics/json-utilities.cpp
Basics/json.cpp
Basics/levenshtein.cpp
Basics/memory.cpp
Basics/mimetypes.cpp
Basics/prime-numbers.cpp
Basics/process-utils.cpp
Basics/random.cpp
Basics/socket-utils.cpp
Basics/ssl-helper.cpp
Basics/structures.cpp
Basics/system-functions.cpp
Basics/terminal-utils.cpp
Basics/tri-strings.cpp
Basics/tri-zip.cpp
Basics/vector.cpp
Basics/voc-errors.cpp
Basics/voc-mimetypes.cpp
JsonParser/json-parser.cpp
ProgramOptions/program-options.cpp
Rest/Endpoint.cpp
Rest/EndpointIp.cpp
Rest/EndpointIpV4.cpp
Rest/EndpointIpV6.cpp
Rest/EndpointList.cpp
Rest/HttpRequest.cpp
Rest/HttpResponse.cpp
Rest/InitializeRest.cpp
Rest/SslInterface.cpp
Rest/Version.cpp
Utilities/LineEditor.cpp
Utilities/ScriptLoader.cpp
Utilities/ShellBase.cpp
Zip/ioapi.cpp
Zip/unzip.cpp
Zip/zip.cpp
SimpleHttpClient/GeneralClientConnection.cpp
SimpleHttpClient/ClientConnection.cpp
SimpleHttpClient/ConnectionManager.cpp
SimpleHttpClient/SslClientConnection.cpp
SimpleHttpClient/SimpleHttpClient.cpp
SimpleHttpClient/SimpleHttpResult.cpp
)
## -----------------------------------------------------------------------------
## --SECTION-- END-OF-FILE
## -----------------------------------------------------------------------------
################################################################################
## LIB_ARANGO_V8
################################################################################
## Local Variables:
## mode: outline-minor
## outline-regexp: "^\\(### @brief\\|## --SECTION--\\|# -\\*- \\)"
## End:
add_library(${LIB_ARANGO_V8} STATIC
V8/JSLoader.cpp
V8/V8LineEditor.cpp
V8/v8-buffer.cpp
V8/v8-conv.cpp
V8/v8-globals.cpp
V8/v8-json.cpp
V8/v8-shell.cpp
V8/v8-utils.cpp
V8/v8-vpack.cpp
V8/v8-environment.cpp
)