diff --git a/cmake/FindAllRequirements.cmake b/cmake/FindAllRequirements.cmake index ddcba15..5df1b3b 100644 --- a/cmake/FindAllRequirements.cmake +++ b/cmake/FindAllRequirements.cmake @@ -17,8 +17,10 @@ function (build_external_project target prefix url) #FOLLOWING ARGUMENTS are the ExternalProject_add(${target} PREFIX ${prefix}/${target} GIT_REPOSITORY ${url} + LIST_SEPARATOR | CMAKE_ARGS ${ARGN} INSTALL_COMMAND \"\" + BUILD_COMMAND \"\" ) add_custom_target(trigger_${target}) @@ -66,19 +68,16 @@ set(EXTERNAL_LOCATION ${CMAKE_BINARY_DIR}/external CACHE STRING "external source set(_HUNTER_ROOT "${Boost_DIR}/../../../") message("HUNTER ROOT DIRECTORY ${_HUNTER_ROOT}") +string(REPLACE ";" "|" CMAKE_PREFIX_PATH_ALT_SEP "${CMAKE_PREFIX_PATH}") build_external_project(project_wt wt https://github.com/emweb/wt.git -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_INSTALL_PREFIX=${EXTERNAL_LOCATION} -# -DSHARED_LIBS:BOOL=OFF + -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH_ALT_SEP} -DBoost_NO_BOOST_CMAKE=TRUE -DBoost_NO_SYSTEM_PATHS=TRUE - -DBOOST_ROOT:PATHNAME=${_HUNTER_ROOT} - -DBOOST_INCLUDEDIR:FILEPATH=${_HUNTER_ROOT}/include - -DBOOST_LIBRARYDIR:FILEPATH=${_HUNTER_ROOT}/lib -# -DBoost_USE_STATIC_LIBS=TRUE -DBUILD_EXAMPLES=OFF -DINSTALL_RESOURCES=OFF -DENABLE_SSL=OFF @@ -105,10 +104,12 @@ set_target_properties(wthttp PROPERTIES IMPORTED_LOCATION ${EXTERNAL_LOCATION}/l add_dependencies(wthttp project_wt) LIST(APPEND CMAKE_MODULE_PATH "${EXTERNAL_LOCATION}") +#LIST(APPEND CMAKE_MODULE_PATH "${_HUNTER_ROOT}/lib") build_external_project(project_hhdate date https://github.com/HowardHinnant/date.git -DCMAKE_INSTALL_PREFIX=${EXTERNAL_LOCATION} + -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH_ALT_SEP} -DTZ_CXX_STANDARD=14 ) @@ -118,6 +119,7 @@ add_dependencies(date project_hhdate) build_external_project(project_sqlpp sqlpp https://github.com/rbock/sqlpp11.git -DCMAKE_INSTALL_PREFIX=${EXTERNAL_LOCATION} + -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH_ALT_SEP} -DENABLE_TESTS=FALSE ) @@ -129,3 +131,13 @@ link_directories(${_HUNTER_ROOT}/lib) find_library(wt REQUIRED) find_library(wthttp REQUIRED) find_library(sqlpp REQUIRED) + +build_external_project(project_sqlpp_connector sqlpp_connector + https://github.com/matthijs/sqlpp11-connector-postgresql.git + -DCMAKE_INSTALL_PREFIX=${EXTERNAL_LOCATION} + -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH_ALT_SEP} + -DENABLE_TESTS=FALSE + -DDATE_INCLUDE_DIR=${EXTERNAL_LOCATION}/include/date + -DSQLPP11_INCLUDE_DIR=${EXTERNAL_LOCATION}/include +) +