From 7bfff75822cafa858a021e2f30dc352ad9f87ebf Mon Sep 17 00:00:00 2001 From: cszawisza Date: Mon, 22 Jan 2018 22:51:39 +0100 Subject: [PATCH] add Wt deps --- CMakeLists.txt | 2 +- cmake/FindAllRequirements.cmake | 31 +++++++++++++++++++++++++++++++ tests/unit/CMakeLists.txt | 2 +- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4acfa81..cc897f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,5 +30,5 @@ include(cmake/FindAllRequirements.cmake) #find_package(PostgreSQL REQUIRED) #add_subdirectory(src) -#add_subdirectory(tests) +add_subdirectory(tests) #add_subdirectory(benchmarks) diff --git a/cmake/FindAllRequirements.cmake b/cmake/FindAllRequirements.cmake index 4337021..2ed291b 100644 --- a/cmake/FindAllRequirements.cmake +++ b/cmake/FindAllRequirements.cmake @@ -1,3 +1,7 @@ +include(ExternalProject) + +#https://github.com/ruslo/hunter/wiki/dev.variables + hunter_add_package(Boost) find_package(Boost CONFIG REQUIRED) @@ -15,3 +19,30 @@ find_package(spdlog CONFIG REQUIRED) hunter_add_package(range-v3) find_package(range-v3 CONFIG REQUIRED) + +set(EXTERNAL_INSTALL_LOCATION ${CMAKE_BINARY_DIR}/external) + +ExternalProject_Add(wt + GIT_REPOSITORY https://github.com/emweb/wt.git + CMAKE_ARGS + -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_INSTALL_PREFIX=${EXTERNAL_INSTALL_LOCATION} + -DBOOST_ROOT=/home/bwieczor/.hunter/_Base/a412c45/f8d72b9/85521ae/Install/ + -DBOOST_INCLUDEDIR=/home/bwieczor/.hunter/_Base/a412c45/f8d72b9/85521ae/Install/include/ + -DBOOST_LIBRARYDIR=/home/bwieczor/.hunter/_Base/a412c45/f8d72b9/85521ae/Install/lib/ + -DBoost_NO_SYSTEM_PATHS=ON + -DBUILD_EXAMPLES=OFF + -DINSTALL_RESOURCES=OFF + -DENABLE_SSL=OFF + -DENABLE_HARU=OFF + -DENABLE_PANGO=OFF + -DENABLE_SQLITE=OFF + -DENABLE_POSTGRES=OFF + -DENABLE_FIREBIRD=OFF + -DENABLE_MYSQL=OFF + -DENABLE_MSSQLSERVER=OFF + -DENABLE_QT4=OFF + -DENABLE_LIBWTDBO=OFF + -DENABLE_OPENGL=OFF + -DENABLE_UNWIND=OFF ) diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 387161e..45558ce 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -17,7 +17,7 @@ include_directories( ${gmock_SOURCE_DIR}/include) INCLUDE_DIRECTORIES(${PostgreSQL_INCLUDE_DIRS}) add_executable( ${TEST_EXECUTABLE_NAME} ${TEST_FILES}) - target_link_libraries( ${TEST_EXECUTABLE_NAME} GMock::main wt wttest eedb_db auth ${Boost_LIBRARIES} ) +# target_link_libraries( ${TEST_EXECUTABLE_NAME} GMock::main wt wttest eedb_db auth ${Boost_LIBRARIES} ) add_test( ${TEST_EXECUTABLE_NAME} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TEST_EXECUTABLE_NAME}) #endif()