From 1e98c820bbc6712e0e9bec4dc63f9b1cd83dee78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Sat, 8 Sep 2018 20:15:51 +0200 Subject: [PATCH] Simplify the Appveyor configuration batch script --- examples/CMakeLists.txt | 2 ++ misc/appveyorBuildConfigurationScript.bat | 10 ++-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 8e07e4cd..aa89ab45 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -8,6 +8,8 @@ cmake_minimum_required( VERSION 3.0 ) project( CatchExamples CXX ) +message( STATUS "Examples included" ) + # define folders used: set( EXAMPLES_DIR ${CATCH_DIR}/examples ) diff --git a/misc/appveyorBuildConfigurationScript.bat b/misc/appveyorBuildConfigurationScript.bat index 6d3d0b8a..f07bb707 100644 --- a/misc/appveyorBuildConfigurationScript.bat +++ b/misc/appveyorBuildConfigurationScript.bat @@ -13,14 +13,8 @@ if "%CONFIGURATION%"=="Debug" ( cmake -H. -BBuild -A%PLATFORM% -DUSE_WMAIN=%wmain% -DMEMORYCHECK_COMMAND=build-misc\Debug\CoverageHelper.exe -DMEMORYCHECK_COMMAND_OPTIONS=--sep-- -DMEMORYCHECK_TYPE=Valgrind || exit /b !ERRORLEVEL! || exit /b !ERRORLEVEL! ) else ( @REM # We know that coverage is 0 - if "%examples%"=="1" ( - @REM # Examples live off the single header, so it needs to be regenerated - python scripts\generateSingleHeader.py || exit /b !ERRORLEVEL! - cmake -H. -BBuild -A%PLATFORM% -DUSE_WMAIN=%wmain% -DCATCH_BUILD_EXAMPLES=ON -DCATCH_BUILD_EXTRA_TESTS=ON || exit /b !ERRORLEVEL! - ) else ( - @REM # This is just a plain debug build - cmake -H. -BBuild -A%PLATFORM% -DUSE_WMAIN=%wmain% || exit /b !ERRORLEVEL! - ) + python scripts\generateSingleHeader.py || exit /b !ERRORLEVEL! + cmake -H. -BBuild -A%PLATFORM% -DUSE_WMAIN=%wmain% -DCATCH_BUILD_EXAMPLES=%examples% -DCATCH_BUILD_EXTRA_TESTS=%examples% || exit /b !ERRORLEVEL! ) ) if "%CONFIGURATION%"=="Release" (