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

fixed order of pthread, fixed cmake 2.8

This commit is contained in:
Frank Celler 2016-05-04 13:50:57 +02:00
parent c0c23973f1
commit d5fd6ac0e7
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -75,7 +75,11 @@ set(TEST_GEO_SUITE geo_suite)
## VERSION FILES ## 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 ( configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}/lib/Basics/build.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/lib/Basics/build.h.in"
@ -146,8 +150,6 @@ else ()
set(MAKE make) set(MAKE make)
endif () endif ()
find_package(FLEX)
find_package(BISON)
find_package(PythonInterp 2 REQUIRED) find_package(PythonInterp 2 REQUIRED)
get_filename_component(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} REALPATH) get_filename_component(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} REALPATH)
@ -352,6 +354,9 @@ option(USE_MAINTAINER_MODE
if (USE_MAINTAINER_MODE) if (USE_MAINTAINER_MODE)
add_definitions("-DARANGODB_ENABLE_MAINTAINER_MODE=1") add_definitions("-DARANGODB_ENABLE_MAINTAINER_MODE=1")
find_package(FLEX)
find_package(BISON)
endif () endif ()
################################################################################ ################################################################################
@ -768,9 +773,9 @@ list(INSERT SYSTEM_LIBRARIES 0
${ICU_LIBS} ${ICU_LIBS}
${OPENSSL_LIBRARIES} ${OPENSSL_LIBRARIES}
${BASE_LIBS} ${BASE_LIBS}
${CMAKE_THREAD_LIBS_INIT}
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}
${SYS_LIBS} ${SYS_LIBS}
${CMAKE_THREAD_LIBS_INIT}
) )
add_subdirectory(lib) add_subdirectory(lib)

2
UnitTests/CMakeLists.txt
View File

@ -34,7 +34,7 @@ add_executable(${TEST_BASICS_SUITE}
../lib/Basics/WorkMonitorDummy.cpp ../lib/Basics/WorkMonitorDummy.cpp
) )
target_include_directories( include_directories(
${TEST_BASICS_SUITE} ${TEST_BASICS_SUITE}
PUBLIC ${Boost_UNIT_TEST_INCLUDE_DIR} PUBLIC ${Boost_UNIT_TEST_INCLUDE_DIR}
) )