From d5fd6ac0e7c41d515d9993e5f3b38d026ca5b423 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Wed, 4 May 2016 13:50:57 +0200 Subject: [PATCH] fixed order of pthread, fixed cmake 2.8 --- CMakeLists.txt | 13 +++++++++---- UnitTests/CMakeLists.txt | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 71ccd3d287..278912ceb5 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/UnitTests/CMakeLists.txt b/UnitTests/CMakeLists.txt index 6344668795..c18f3a91c7 100644 --- a/UnitTests/CMakeLists.txt +++ b/UnitTests/CMakeLists.txt @@ -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} )