From e57a077c1b900a85730de67fb639298cffaaa02b Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Thu, 25 Feb 2016 20:21:04 +0100 Subject: [PATCH 1/5] added dependencies --- 3rdParty/OpenSSL/CMakeLists.txt | 7 +++++++ 3rdParty/V8/CMakeLists.txt | 3 +++ 3rdParty/zlib/zlib-1.2.8/CMakeLists.txt | 4 ++-- CMakeLists.txt | 8 +++++--- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/3rdParty/OpenSSL/CMakeLists.txt b/3rdParty/OpenSSL/CMakeLists.txt index 7d4b36f360..0803e6d574 100644 --- a/3rdParty/OpenSSL/CMakeLists.txt +++ b/3rdParty/OpenSSL/CMakeLists.txt @@ -28,3 +28,10 @@ set(OPENSSL_INCLUDE_DIR "OpenSSL: Include Directory" FORCE ) + +set(OPENSSL_LIBRARIES + "${OPENSSL_LIBRARIES}" + CACHE INTERNAL + "OpenSSL: Libraries Directory" + FORCE +) diff --git a/3rdParty/V8/CMakeLists.txt b/3rdParty/V8/CMakeLists.txt index 051667fc70..c122463c78 100644 --- a/3rdParty/V8/CMakeLists.txt +++ b/3rdParty/V8/CMakeLists.txt @@ -91,6 +91,9 @@ else () endif () endif() +list(APPEND V8_COMPILE_ARGS icui18n icuuc icudata) +list(APPEND V8_COMPILE_ARGS v8) + ExternalProject_Add(v8_build BUILD_IN_SOURCE TRUE SOURCE_DIR "${V8_DIR}" diff --git a/3rdParty/zlib/zlib-1.2.8/CMakeLists.txt b/3rdParty/zlib/zlib-1.2.8/CMakeLists.txt index 323f7a5d7d..a96ed4ce9b 100644 --- a/3rdParty/zlib/zlib-1.2.8/CMakeLists.txt +++ b/3rdParty/zlib/zlib-1.2.8/CMakeLists.txt @@ -241,11 +241,11 @@ endif() 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) add_test(example example) -add_executable(minigzip test/minigzip.c) +add_executable(minigzip EXCLUDE_FROM_ALL test/minigzip.c) target_link_libraries(minigzip zlib) if(HAVE_OFF64_T) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37618883c8..c54c1957e3 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -326,9 +326,8 @@ endif () include(VcMacros) -# we do not want to build specialized packages for one architecture -# include(OptimizeForArchitecture) -# OptimizeForArchitecture() +include(OptimizeForArchitecture) +OptimizeForArchitecture() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_ARCHITECTURE_FLAGS}") @@ -563,3 +562,6 @@ add_subdirectory(arangosh) add_subdirectory(arangod) add_subdirectory(UnitTests) add_subdirectory(Documentation) + +add_dependencies(arangod ev zlibstatic v8_build) +add_dependencies(arangosh zlibstatic v8_build) From 3568d10bd3682c8f892200163c8b6c16fa7c92f6 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Thu, 25 Feb 2016 20:23:42 +0100 Subject: [PATCH 2/5] added dependencies for tests --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c54c1957e3..06ebad3f97 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -565,3 +565,5 @@ add_subdirectory(Documentation) add_dependencies(arangod ev zlibstatic v8_build) add_dependencies(arangosh zlibstatic v8_build) +add_dependencies(basics_suite v8_build) +add_dependencies(geo_suite v8_build) From e02b6f99cd8aec388bed3a19d3715efed594adc8 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Thu, 25 Feb 2016 20:25:15 +0100 Subject: [PATCH 3/5] added lib for documentation --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 06ebad3f97..0245790f4b 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -563,7 +563,7 @@ add_subdirectory(arangod) add_subdirectory(UnitTests) add_subdirectory(Documentation) -add_dependencies(arangod ev zlibstatic v8_build) -add_dependencies(arangosh zlibstatic v8_build) -add_dependencies(basics_suite v8_build) -add_dependencies(geo_suite v8_build) +add_dependencies(arangod ev zlibstatic v8_build lib) +add_dependencies(arangosh zlibstatic v8_build lib) +add_dependencies(basics_suite v8_build lib) +add_dependencies(geo_suite v8_build lib) From 52ac7742d5deefa6ae097b1b1bd2cc0e39e70805 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Thu, 25 Feb 2016 20:26:33 +0100 Subject: [PATCH 4/5] removed lib again --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0245790f4b..06ebad3f97 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -563,7 +563,7 @@ add_subdirectory(arangod) add_subdirectory(UnitTests) add_subdirectory(Documentation) -add_dependencies(arangod ev zlibstatic v8_build lib) -add_dependencies(arangosh zlibstatic v8_build lib) -add_dependencies(basics_suite v8_build lib) -add_dependencies(geo_suite v8_build lib) +add_dependencies(arangod ev zlibstatic v8_build) +add_dependencies(arangosh zlibstatic v8_build) +add_dependencies(basics_suite v8_build) +add_dependencies(geo_suite v8_build) From ca7651cc8dc45151c0a415815da3fb4c751273f0 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Thu, 25 Feb 2016 20:29:02 +0100 Subject: [PATCH 5/5] added all tools --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 06ebad3f97..8f685ae9ed 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -563,7 +563,11 @@ add_subdirectory(arangod) add_subdirectory(UnitTests) 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)