diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2019-10-08 23:59:59 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2019-10-08 23:59:59 +0300 |
| commit | 8613f89fd6249cac815c7c1f1bdf3056c8478c3e (patch) | |
| tree | 674b06f53957a4b1500326688196fbabaa046545 | |
| parent | fba8c59a0c8455205bc1d2b5974a3829608f4914 (diff) | |
Hopefully definitely fix programs on Travis this time.
| -rw-r--r-- | .ci.cmake | 2 | ||||
| -rw-r--r-- | programs/CMakeLists.txt | 31 |
2 files changed, 21 insertions, 12 deletions
@@ -12,7 +12,7 @@ set(CTEST_GIT_COMMAND "${GIT_EXECUTABLE}") ctest_start("Experimental") ctest_update() -ctest_configure(OPTIONS ${CTEST_CONFIGURE_OPTIONS}) +ctest_configure(OPTIONS -DCMAKE_BUILD_TYPE=${CTEST_CONFIGURATION_TYPE} ${CTEST_CONFIGURE_OPTIONS}) ctest_build(TARGET _dl) ctest_build(TARGET _sl) set(retval 0) diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt index 7e4f63bc..e9d73195 100644 --- a/programs/CMakeLists.txt +++ b/programs/CMakeLists.txt @@ -1,11 +1,29 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) +include(../cmake/QuickCppLibBootstrap.cmake) +include(QuickCppLibUtils) +project(llfio-programs VERSION 1.0 LANGUAGES CXX) + +find_quickcpplib_library(quickcpplib + GIT_REPOSITORY "https://github.com/ned14/quickcpplib.git" + REQUIRED + IS_HEADER_ONLY +) +find_quickcpplib_library(outcome + GIT_REPOSITORY "https://github.com/ned14/outcome.git" + GIT_TAG "develop" + REQUIRED + IS_HEADER_ONLY +) +find_quickcpplib_library(kerneltest + GIT_REPOSITORY "https://github.com/ned14/kerneltest.git" + REQUIRED + IS_HEADER_ONLY +) if(NOT TARGET llfio::hl) add_subdirectory(.. llfio EXCLUDE_FROM_ALL) endif() -project(llfio-programs VERSION 1.0 LANGUAGES CXX) - # Looks like cmake's toolset for LLVM-vs* has some serious problems if(CMAKE_GENERATOR_TOOLSET MATCHES "LLVM-vs.*") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi") @@ -14,15 +32,6 @@ endif() function(make_program program) add_executable(${program} "${program}/main.cpp") - # Hack for sibling config - if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../.quickcpplib_use_siblings") - target_include_directories(${program} PRIVATE "../..") - target_include_directories(${program} PRIVATE "../../.quickcpplib_use_siblings") - target_include_directories(${program} PRIVATE "../../.quickcpplib_use_siblings/a") - target_include_directories(${program} PRIVATE "../../.quickcpplib_use_siblings/a/a") - else() - target_include_directories(${program} PRIVATE "../test") - endif() if(WIN32) target_compile_definitions(${program} PRIVATE _UNICODE UNICODE) # cmake's support for LLVM clang is shocking :( |