Skip to content
Snippets Groups Projects
Commit a2ccdf48 authored by Wittenburg, William's avatar Wittenburg, William
Browse files

Move setting of test configuration type into common

parent 4b43fc34
No related branches found
No related tags found
1 merge request!272CI Fixes: master build name + test configuration type
# Client maintainer: chuck.atkins@kitware.com # Client maintainer: chuck.atkins@kitware.com
set(CTEST_SITE "AppVeyor") set(CTEST_SITE "AppVeyor")
set(CTEST_BUILD_CONFIGURATION Release) set(CTEST_BUILD_CONFIGURATION Release)
set(CTEST_CONFIGURATION_TYPE Release)
set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64") set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")
set(CTEST_TEST_ARGS PARALLEL_LEVEL 4) set(CTEST_TEST_ARGS PARALLEL_LEVEL 4)
......
...@@ -131,12 +131,15 @@ if(NOT "${dashboard_model}" MATCHES "^(Nightly|Experimental)$") ...@@ -131,12 +131,15 @@ if(NOT "${dashboard_model}" MATCHES "^(Nightly|Experimental)$")
message(FATAL_ERROR "dashboard_model must be Nightly or Experimental") message(FATAL_ERROR "dashboard_model must be Nightly or Experimental")
endif() endif()
# Default to a Debug build. # Default to a Debug build.
if(NOT DEFINED CTEST_BUILD_CONFIGURATION) if(NOT DEFINED CTEST_BUILD_CONFIGURATION)
set(CTEST_BUILD_CONFIGURATION Debug) set(CTEST_BUILD_CONFIGURATION Debug)
endif() endif()
if(NOT DEFINED CTEST_CONFIGURATION_TYPE)
set(CTEST_CONFIGURATION_TYPE ${CTEST_BUILD_CONFIGURATION})
endif()
# Choose CTest reporting mode. # Choose CTest reporting mode.
if(NOT "${CTEST_CMAKE_GENERATOR}" MATCHES "Make|Ninja") if(NOT "${CTEST_CMAKE_GENERATOR}" MATCHES "Make|Ninja")
# Launchers work only with Makefile and Ninja generators. # Launchers work only with Makefile and Ninja generators.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment