From a2ccdf489d0154720fa87934ad7d6259a8ef2d28 Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Wed, 20 Sep 2017 15:55:24 -0600
Subject: [PATCH] Move setting of test configuration type into common
---
scripts/appveyor/av_default.cmake | 1 -
scripts/dashboard/common.cmake | 5 ++++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/appveyor/av_default.cmake b/scripts/appveyor/av_default.cmake
index 81ad4fbbb..13dc0645b 100644
--- a/scripts/appveyor/av_default.cmake
+++ b/scripts/appveyor/av_default.cmake
@@ -1,7 +1,6 @@
# Client maintainer: chuck.atkins@kitware.com
set(CTEST_SITE "AppVeyor")
set(CTEST_BUILD_CONFIGURATION Release)
-set(CTEST_CONFIGURATION_TYPE Release)
set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")
set(CTEST_TEST_ARGS PARALLEL_LEVEL 4)
diff --git a/scripts/dashboard/common.cmake b/scripts/dashboard/common.cmake
index ac88d9372..aa3649705 100644
--- a/scripts/dashboard/common.cmake
+++ b/scripts/dashboard/common.cmake
@@ -131,12 +131,15 @@ if(NOT "${dashboard_model}" MATCHES "^(Nightly|Experimental)$")
message(FATAL_ERROR "dashboard_model must be Nightly or Experimental")
endif()
-
# Default to a Debug build.
if(NOT DEFINED CTEST_BUILD_CONFIGURATION)
set(CTEST_BUILD_CONFIGURATION Debug)
endif()
+if(NOT DEFINED CTEST_CONFIGURATION_TYPE)
+ set(CTEST_CONFIGURATION_TYPE ${CTEST_BUILD_CONFIGURATION})
+endif()
+
# Choose CTest reporting mode.
if(NOT "${CTEST_CMAKE_GENERATOR}" MATCHES "Make|Ninja")
# Launchers work only with Makefile and Ninja generators.
--
GitLab