From 2c01c5d5c836871aa1a159e59e27e9b9a07b68ef Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 5 Jan 2019 19:55:38 +0200 Subject: [PATCH] Add test/cmake_subdir_test --- .travis.yml | 11 ++++++++++- test/cmake_subdir_test/CMakeLists.txt | 22 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 test/cmake_subdir_test/CMakeLists.txt diff --git a/.travis.yml b/.travis.yml index 20f89e7..23f53e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -# Copyright 2016, 2017, 2018 Peter Dimov +# Copyright 2016-2019 Peter Dimov # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt) @@ -361,6 +361,15 @@ matrix: compiler: clang++ env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z + - os: linux + compiler: g++ + env: CMAKE_SUBDIR_TEST=1 + script: + - cd test/cmake_subdir_test && mkdir __build__ && cd __build__ + - cmake .. + - cmake --build . + - cmake --build . --target check + install: - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true - cd .. diff --git a/test/cmake_subdir_test/CMakeLists.txt b/test/cmake_subdir_test/CMakeLists.txt new file mode 100644 index 0000000..587e7c6 --- /dev/null +++ b/test/cmake_subdir_test/CMakeLists.txt @@ -0,0 +1,22 @@ +# Copyright 2018, 2019 Peter Dimov +# Distributed under the Boost Software License, Version 1.0. +# See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt + +cmake_minimum_required(VERSION 3.5) + +project(cmake_subdir_test LANGUAGES CXX) + +add_subdirectory(../.. boostorg/system) +add_subdirectory(../../../assert boostorg/assert) +add_subdirectory(../../../config boostorg/config) +add_subdirectory(../../../core boostorg/core) +add_subdirectory(../../../predef boostorg/predef) +add_subdirectory(../../../winapi boostorg/winapi) + +add_executable(quick ../quick.cpp) +target_link_libraries(quick Boost::system Boost::core) + +enable_testing() +add_test(quick quick) + +add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $)