From 715da04bb99cf9d43971cfed2ce58a16672a56a6 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Tue, 1 Mar 2016 15:11:39 +0100 Subject: [PATCH] cleanup --- 3rdParty/V8/CMakeLists.txt | 3 +-- 3rdParty/boost/CMakeLists.txt | 4 ++-- CMakeLists.txt | 34 +++++++++++----------------------- UnitTests/CMakeLists.txt | 4 ++++ arangod/CMakeLists.txt | 3 +++ arangosh/CMakeLists.txt | 11 +++++++++++ 6 files changed, 32 insertions(+), 27 deletions(-) diff --git a/3rdParty/V8/CMakeLists.txt b/3rdParty/V8/CMakeLists.txt index 8171c159d0..8eb4a0d04c 100644 --- a/3rdParty/V8/CMakeLists.txt +++ b/3rdParty/V8/CMakeLists.txt @@ -242,7 +242,7 @@ if (WIN32) "${V8_LIBRARY_DIR}/lib/v8_base.lib;${V8_LIBRARY_DIR}/lib/v8_libbase.lib;${V8_LIBRARY_DIR}/lib/v8_libplatform.lib;${V8_LIBRARY_DIR}/lib/v8_nosnapshot.lib" CACHE INTERNAL "${PROJECT_NAME}: Libraries" - ) + ) else () @@ -315,7 +315,6 @@ else () "icui18n;icuuc;icudata" CACHE INTERNAL "ICU: Libraries" - FORCE ) endif() diff --git a/3rdParty/boost/CMakeLists.txt b/3rdParty/boost/CMakeLists.txt index 57b2dc1c91..a15b73ef5f 100644 --- a/3rdParty/boost/CMakeLists.txt +++ b/3rdParty/boost/CMakeLists.txt @@ -37,7 +37,7 @@ if (Boost_UNIT_TEST_FRAMEWORK_FOUND) if (HAVE_USABLE_BOOT_LIBRARIES) option(USE_BOOST_UNITTESTS "use boost unit-tests" ON) else () - message("cannot use BOOST library ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}") + message(STATUS "cannot use BOOST library ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}") option(USE_BOOST_UNITTESTS "use boost unit-tests" OFF) endif () else () @@ -45,7 +45,7 @@ else () endif () if (NOT USE_BOOST_UNITTESTS) - message("BOOST unit-tests are disabled") + message(STATUS "BOOST unit-tests are disabled") endif () set(BOOST_VERSION diff --git a/CMakeLists.txt b/CMakeLists.txt index 781a0dddef..a703c847f1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,7 +173,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "MSVC") endif () if (WINDOWS) - set(BASE_FLAGS "/DWIN32 /D_WINDOWS /W3") + set(BASE_FLAGS "/D WIN32 /D _WINDOWS /W3") set(BASE_C_FLAGS) set(BASE_CXX_FLAGS "/GR /EHsc") else () @@ -395,17 +395,17 @@ elseif (MSVC) message(STATUS "Compiler type MSVC: ${CMAKE_CXX_COMPILER}") endif () - set(CMAKE_C_FLAGS "" CACHE STRING "default C++ compiler flags") - set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1" CACHE STRING "C++ debug flags") - set(CMAKE_C_FLAGS_MINSIZEREL "/MT /O1 /Ob1 /D NDEBUG" CACHE STRING "C++ minimal size flags") - set(CMAKE_C_FLAGS_RELEASE "/MT /O2 /Ob2 /D NDEBUG" CACHE STRING "C++ release flags") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG" CACHE STRING "C++ release with debug info flags") + set(CMAKE_C_FLAGS "" CACHE STRING "default C++ compiler flags") + set(CMAKE_C_FLAGS_DEBUG "/D _DEBUG /MTd /Zi /Ob0 /Od /RTC1" CACHE STRING "C++ debug flags") + set(CMAKE_C_FLAGS_MINSIZEREL "/MT /O1 /Ob1 /D NDEBUG" CACHE STRING "C++ minimal size flags") + set(CMAKE_C_FLAGS_RELEASE "/MT /O2 /Ob2 /D NDEBUG" CACHE STRING "C++ release flags") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG" CACHE STRING "C++ release with debug info flags") - set(CMAKE_CXX_FLAGS "" CACHE STRING "default C++ compiler flags") - set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1" CACHE STRING "C++ debug flags") - set(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O1 /Ob1 /D NDEBUG" CACHE STRING "C++ minimal size flags") - set(CMAKE_CXX_FLAGS_RELEASE "/MT /O2 /Ob2 /D NDEBUG" CACHE STRING "C++ release flags") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG" CACHE STRING "C++ release with debug info flags") + set(CMAKE_CXX_FLAGS "" CACHE STRING "default C++ compiler flags") + set(CMAKE_CXX_FLAGS_DEBUG "/D _DEBUG /MTd /Zi /Ob0 /Od /RTC1" CACHE STRING "C++ debug flags") + set(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O1 /Ob1 /D NDEBUG" CACHE STRING "C++ minimal size flags") + set(CMAKE_CXX_FLAGS_RELEASE "/MT /O2 /Ob2 /D NDEBUG" CACHE STRING "C++ release flags") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG" CACHE STRING "C++ release with debug info flags") else () # unknown compiler @@ -675,15 +675,3 @@ add_subdirectory(arangosh) 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) - -if (USE_BOOST_UNITTESTS) - add_dependencies(basics_suite v8_build) - add_dependencies(geo_suite v8_build) -endif () diff --git a/UnitTests/CMakeLists.txt b/UnitTests/CMakeLists.txt index 46f6f8cd5e..e7b4774afc 100644 --- a/UnitTests/CMakeLists.txt +++ b/UnitTests/CMakeLists.txt @@ -41,6 +41,8 @@ if (USE_BOOST_UNITTESTS) ${BOOST_LIBS} ${SYSTEM_LIBRARIES} ) + + add_dependencies(basics_suite v8_build) endif () ################################################################################ @@ -60,4 +62,6 @@ if (USE_BOOST_UNITTESTS) ${BOOST_LIBS} ${SYSTEM_LIBRARIES} ) + + add_dependencies(geo_suite v8_build) endif () diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt index fc30c03535..3bc017ef54 100644 --- a/arangod/CMakeLists.txt +++ b/arangod/CMakeLists.txt @@ -300,6 +300,7 @@ target_link_libraries(${BIN_ARANGOD} ${LIBEV_LIBS} ${LINENOISE_LIBS} ${MSVC_LIBS} + ${V8_LIBS} ${SYSTEM_LIBRARIES} ) @@ -309,6 +310,8 @@ install( install_config(arangod) +add_dependencies(arangod ev zlibstatic v8_build) + ################################################################################ ## arango-dfdb ################################################################################ diff --git a/arangosh/CMakeLists.txt b/arangosh/CMakeLists.txt index 66f13bc7b6..665eec8d01 100644 --- a/arangosh/CMakeLists.txt +++ b/arangosh/CMakeLists.txt @@ -40,6 +40,8 @@ install( install_config(arangob) +add_dependencies(arangob zlibstatic v8_build) # v8_build includes ICU build + ################################################################################ ## arangodump ################################################################################ @@ -76,6 +78,8 @@ install( install_config(arangodump) +add_dependencies(arangodump zlibstatic v8_build) # v8_build includes ICU build + ################################################################################ ## arangoimp ################################################################################ @@ -112,6 +116,8 @@ install( install_config(arangoimp) +add_dependencies(arangoimp zlibstatic) # v8_build includes ICU build + ################################################################################ ## arangorestore ################################################################################ @@ -148,6 +154,8 @@ install( install_config(arangorestore) +add_dependencies(arangorestore zlibstatic v8_build) # v8_build includes ICU build + ################################################################################ ## arangosh ################################################################################ @@ -178,6 +186,7 @@ target_link_libraries(${BIN_ARANGOSH} ${LIB_ARANGO} ${LINENOISE_LIBS} ${MSVC_LIBS} + ${V8_LIBS} ${SYSTEM_LIBRARIES} ) @@ -187,6 +196,8 @@ install( install_config(arangosh) +add_dependencies(arangosh zlibstatic v8_build) + ################################################################################ ## foxx-manager ################################################################################