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

cleanup

This commit is contained in:
Frank Celler 2016-03-01 15:11:39 +01:00
parent 3574333b5e
commit 715da04bb9
6 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3rdParty/V8/CMakeLists.txt vendored
View File

@ -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" "${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 CACHE INTERNAL
"${PROJECT_NAME}: Libraries" "${PROJECT_NAME}: Libraries"
) )
else () else ()
@ -315,7 +315,6 @@ else ()
"icui18n;icuuc;icudata" "icui18n;icuuc;icudata"
CACHE INTERNAL CACHE INTERNAL
"ICU: Libraries" "ICU: Libraries"
FORCE
) )
endif() endif()

4
3rdParty/boost/CMakeLists.txt vendored
View File

@ -37,7 +37,7 @@ if (Boost_UNIT_TEST_FRAMEWORK_FOUND)
if (HAVE_USABLE_BOOT_LIBRARIES) if (HAVE_USABLE_BOOT_LIBRARIES)
option(USE_BOOST_UNITTESTS "use boost unit-tests" ON) option(USE_BOOST_UNITTESTS "use boost unit-tests" ON)
else () 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) option(USE_BOOST_UNITTESTS "use boost unit-tests" OFF)
endif () endif ()
else () else ()
@ -45,7 +45,7 @@ else ()
endif () endif ()
if (NOT USE_BOOST_UNITTESTS) if (NOT USE_BOOST_UNITTESTS)
message("BOOST unit-tests are disabled") message(STATUS "BOOST unit-tests are disabled")
endif () endif ()
set(BOOST_VERSION set(BOOST_VERSION

34
CMakeLists.txt
View File

@ -173,7 +173,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
endif () endif ()
if (WINDOWS) if (WINDOWS)
set(BASE_FLAGS "/DWIN32 /D_WINDOWS /W3") set(BASE_FLAGS "/D WIN32 /D _WINDOWS /W3")
set(BASE_C_FLAGS) set(BASE_C_FLAGS)
set(BASE_CXX_FLAGS "/GR /EHsc") set(BASE_CXX_FLAGS "/GR /EHsc")
else () else ()
@ -395,17 +395,17 @@ elseif (MSVC)
message(STATUS "Compiler type MSVC: ${CMAKE_CXX_COMPILER}") message(STATUS "Compiler type MSVC: ${CMAKE_CXX_COMPILER}")
endif () endif ()
set(CMAKE_C_FLAGS "" CACHE STRING "default C++ compiler 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_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_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_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_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 "" 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_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_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_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_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG" CACHE STRING "C++ release with debug info flags")
else () else ()
# unknown compiler # unknown compiler
@ -675,15 +675,3 @@ add_subdirectory(arangosh)
add_subdirectory(arangod) add_subdirectory(arangod)
add_subdirectory(UnitTests) add_subdirectory(UnitTests)
add_subdirectory(Documentation) 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 ()

4
UnitTests/CMakeLists.txt
View File

@ -41,6 +41,8 @@ if (USE_BOOST_UNITTESTS)
${BOOST_LIBS} ${BOOST_LIBS}
${SYSTEM_LIBRARIES} ${SYSTEM_LIBRARIES}
) )
add_dependencies(basics_suite v8_build)
endif () endif ()
################################################################################ ################################################################################
@ -60,4 +62,6 @@ if (USE_BOOST_UNITTESTS)
${BOOST_LIBS} ${BOOST_LIBS}
${SYSTEM_LIBRARIES} ${SYSTEM_LIBRARIES}
) )
add_dependencies(geo_suite v8_build)
endif () endif ()

3
arangod/CMakeLists.txt
View File

@ -300,6 +300,7 @@ target_link_libraries(${BIN_ARANGOD}
${LIBEV_LIBS} ${LIBEV_LIBS}
${LINENOISE_LIBS} ${LINENOISE_LIBS}
${MSVC_LIBS} ${MSVC_LIBS}
${V8_LIBS}
${SYSTEM_LIBRARIES} ${SYSTEM_LIBRARIES}
) )
@ -309,6 +310,8 @@ install(
install_config(arangod) install_config(arangod)
add_dependencies(arangod ev zlibstatic v8_build)
################################################################################ ################################################################################
## arango-dfdb ## arango-dfdb
################################################################################ ################################################################################

11
arangosh/CMakeLists.txt
View File

@ -40,6 +40,8 @@ install(
install_config(arangob) install_config(arangob)
add_dependencies(arangob zlibstatic v8_build) # v8_build includes ICU build
################################################################################ ################################################################################
## arangodump ## arangodump
################################################################################ ################################################################################
@ -76,6 +78,8 @@ install(
install_config(arangodump) install_config(arangodump)
add_dependencies(arangodump zlibstatic v8_build) # v8_build includes ICU build
################################################################################ ################################################################################
## arangoimp ## arangoimp
################################################################################ ################################################################################
@ -112,6 +116,8 @@ install(
install_config(arangoimp) install_config(arangoimp)
add_dependencies(arangoimp zlibstatic) # v8_build includes ICU build
################################################################################ ################################################################################
## arangorestore ## arangorestore
################################################################################ ################################################################################
@ -148,6 +154,8 @@ install(
install_config(arangorestore) install_config(arangorestore)
add_dependencies(arangorestore zlibstatic v8_build) # v8_build includes ICU build
################################################################################ ################################################################################
## arangosh ## arangosh
################################################################################ ################################################################################
@ -178,6 +186,7 @@ target_link_libraries(${BIN_ARANGOSH}
${LIB_ARANGO} ${LIB_ARANGO}
${LINENOISE_LIBS} ${LINENOISE_LIBS}
${MSVC_LIBS} ${MSVC_LIBS}
${V8_LIBS}
${SYSTEM_LIBRARIES} ${SYSTEM_LIBRARIES}
) )
@ -187,6 +196,8 @@ install(
install_config(arangosh) install_config(arangosh)
add_dependencies(arangosh zlibstatic v8_build)
################################################################################ ################################################################################
## foxx-manager ## foxx-manager
################################################################################ ################################################################################