mirror of https://gitee.com/bigwinds/arangodb
fixed order of pthread, fixed cmake 2.8
This commit is contained in:
parent
c0c23973f1
commit
d5fd6ac0e7
|
@ -75,7 +75,11 @@ set(TEST_GEO_SUITE geo_suite)
|
|||
## VERSION FILES
|
||||
################################################################################
|
||||
|
||||
string(TIMESTAMP ARANGODB_BUILD_DATE "%Y-%m-%d %H:%M:%S")
|
||||
if (${CMAKE_MAJOR_VERSION} EQUAL 2)
|
||||
set(ARANGODB_BUILD_DATE "YYYY-MM-DD HH:MM:SS")
|
||||
else ()
|
||||
string(TIMESTAMP ARANGODB_BUILD_DATE "%Y-%m-%d %H:%M:%S")
|
||||
endif ()
|
||||
|
||||
configure_file (
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/lib/Basics/build.h.in"
|
||||
|
@ -146,8 +150,6 @@ else ()
|
|||
set(MAKE make)
|
||||
endif ()
|
||||
|
||||
find_package(FLEX)
|
||||
find_package(BISON)
|
||||
find_package(PythonInterp 2 REQUIRED)
|
||||
get_filename_component(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} REALPATH)
|
||||
|
||||
|
@ -352,6 +354,9 @@ option(USE_MAINTAINER_MODE
|
|||
|
||||
if (USE_MAINTAINER_MODE)
|
||||
add_definitions("-DARANGODB_ENABLE_MAINTAINER_MODE=1")
|
||||
|
||||
find_package(FLEX)
|
||||
find_package(BISON)
|
||||
endif ()
|
||||
|
||||
################################################################################
|
||||
|
@ -768,9 +773,9 @@ list(INSERT SYSTEM_LIBRARIES 0
|
|||
${ICU_LIBS}
|
||||
${OPENSSL_LIBRARIES}
|
||||
${BASE_LIBS}
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${CMAKE_DL_LIBS}
|
||||
${SYS_LIBS}
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
)
|
||||
|
||||
add_subdirectory(lib)
|
||||
|
|
|
@ -34,7 +34,7 @@ add_executable(${TEST_BASICS_SUITE}
|
|||
../lib/Basics/WorkMonitorDummy.cpp
|
||||
)
|
||||
|
||||
target_include_directories(
|
||||
include_directories(
|
||||
${TEST_BASICS_SUITE}
|
||||
PUBLIC ${Boost_UNIT_TEST_INCLUDE_DIR}
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue