From d05d71bbd5f459f77fb1e1a47482d3fe0b8c2142 Mon Sep 17 00:00:00 2001 From: Snaipe Date: Tue, 22 Sep 2015 00:16:45 +0200 Subject: [PATCH] Renamed TESTS cmake option to CTESTS --- .travis.yml | 2 +- CMakeLists.txt | 4 ++-- appveyor.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 83c8647..621b5a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ script: - > cmake -Wno-dev - -DTESTS=ON + -DCTESTS=ON -DCOVERALLS=${COVERAGE} -DCMAKE_BUILD_TYPE=${CONFIGURATION} -DCMAKE_INSTALL_PREFIX=criterion-${TRAVIS_TAG} diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ee09e3..9bd4d04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ endif() # Setup coveralls -option(TESTS "Turn on the samples and test" OFF) +option(CTESTS "Turn on the samples and test" OFF) option(COVERALLS "Turn on coveralls support" OFF) option(COVERALLS_UPLOAD "Upload the generated coveralls json" ON) @@ -193,7 +193,7 @@ add_custom_target(gcov -P "${CMAKE_MODULE_PATH}/Gcov.cmake" ) -if (TESTS) +if (CTESTS) enable_testing() add_subdirectory(samples) add_subdirectory(test) diff --git a/appveyor.yml b/appveyor.yml index 869d5ca..29952bb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -38,7 +38,7 @@ install: - > cmake -Wno-dev - -DTESTS=ON + -DCTESTS=ON -DCMAKE_INSTALL_PREFIX="criterion-%RELEASE_NAME%" -DCMAKE_BUILD_TYPE="%CONFIGURATION%" -G "%GENERATOR%"