From 31653b34c9a30c046c4d03688c66c40297dcf668 Mon Sep 17 00:00:00 2001 From: Mike Dev Date: Wed, 17 Oct 2018 11:41:42 +0200 Subject: [PATCH] [CMake/CI] Some cleanup --- appveyor.yml | 9 ++------- test/CMakeLists.txt | 10 ++++------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f3853c0..3d07613 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,5 @@ # Copyright 2017 Edward Diener +# Copyright 2018 Mike Dev # 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) @@ -30,7 +31,6 @@ for: only: - configuration: cmake_self_test - build: off test_script: - mkdir __build__ - cd __build__ @@ -41,6 +41,7 @@ for: matrix: only: - configuration: boost_test + install: - cd .. - git clone -b %APPVEYOR_REPO_BRANCH% https://github.com/boostorg/boost.git boost-root @@ -53,13 +54,7 @@ for: - bootstrap - b2 headers - build: off - test_script: - b2 libs/preprocessor/test toolset=%TOOLSET% - cd ../preprocessor/test - - - - diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4008930..2ec107e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -2,17 +2,15 @@ # 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 # -# NOTE: This does not run the UNIT-TESTS for Boost.PReprocessor. +# NOTE: This does NOT run the unit tests for Boost.Preprocessor (yet). # It only tests, if the CMakeLists.txt file works as expected cmake_minimum_required( VERSION 3.5 ) -project( TestBoostPreprocessorCMakeSelfTest ) +project( BoostPreprocessorCMakeSelfTest ) add_subdirectory( .. ${CMAKE_CURRENT_BINARY_DIR}/boost_preprocessor ) -# arithmetic.cpp is a randomly chosen source file -# that is compilable on it's own. -add_executable( boost_preprocessor_self_test cmake_self_test.cpp ) -target_link_libraries( boost_preprocessor_self_test Boost::preprocessor ) +add_executable( boost_preprocessor_cmake_self_test cmake_self_test.cpp ) +target_link_libraries( boost_preprocessor_cmake_self_test Boost::preprocessor )