From 8f5245168268c99f78074cde24f9dfe75cfaea93 Mon Sep 17 00:00:00 2001
From: Marc Chevrier <marc.chevrier@gmail.com>
Date: Tue, 14 Sep 2021 18:35:21 +0200
Subject: Use new SetOption signatures

---
 Source/CTest/cmCTestSubmitCommand.cxx |  8 ++++----
 Source/CTest/cmCTestTestCommand.cxx   | 20 ++++++++++----------
 Source/CTest/cmCTestUpdateCommand.cxx |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx
index 7aeb288..6824752 100644
--- a/Source/CTest/cmCTestSubmitCommand.cxx
+++ b/Source/CTest/cmCTestSubmitCommand.cxx
@@ -119,15 +119,15 @@ cmCTestGenericHandler* cmCTestSubmitCommand::InitializeHandler()
     handler->SetHttpHeaders(this->HttpHeaders);
   }
 
-  handler->SetOption("RetryDelay", this->RetryDelay.c_str());
-  handler->SetOption("RetryCount", this->RetryCount.c_str());
+  handler->SetOption("RetryDelay", this->RetryDelay);
+  handler->SetOption("RetryCount", this->RetryCount);
   handler->SetOption("InternalTest", this->InternalTest ? "ON" : "OFF");
 
   handler->SetQuiet(this->Quiet);
 
   if (this->CDashUpload) {
-    handler->SetOption("CDashUploadFile", this->CDashUploadFile.c_str());
-    handler->SetOption("CDashUploadType", this->CDashUploadType.c_str());
+    handler->SetOption("CDashUploadFile", this->CDashUploadFile);
+    handler->SetOption("CDashUploadType", this->CDashUploadType);
   }
   return handler;
 }
diff --git a/Source/CTest/cmCTestTestCommand.cxx b/Source/CTest/cmCTestTestCommand.cxx
index 67f4986..80b8d4f 100644
--- a/Source/CTest/cmCTestTestCommand.cxx
+++ b/Source/CTest/cmCTestTestCommand.cxx
@@ -64,13 +64,13 @@ cmCTestGenericHandler* cmCTestTestCommand::InitializeHandler()
   if (!this->Start.empty() || !this->End.empty() || !this->Stride.empty()) {
     handler->SetOption(
       "TestsToRunInformation",
-      cmStrCat(this->Start, ',', this->End, ',', this->Stride).c_str());
+      cmStrCat(this->Start, ',', this->End, ',', this->Stride));
   }
   if (!this->Exclude.empty()) {
-    handler->SetOption("ExcludeRegularExpression", this->Exclude.c_str());
+    handler->SetOption("ExcludeRegularExpression", this->Exclude);
   }
   if (!this->Include.empty()) {
-    handler->SetOption("IncludeRegularExpression", this->Include.c_str());
+    handler->SetOption("IncludeRegularExpression", this->Include);
   }
   if (!this->ExcludeLabel.empty()) {
     handler->AddMultiOption("ExcludeLabelRegularExpression",
@@ -81,30 +81,30 @@ cmCTestGenericHandler* cmCTestTestCommand::InitializeHandler()
   }
   if (!this->ExcludeFixture.empty()) {
     handler->SetOption("ExcludeFixtureRegularExpression",
-                       this->ExcludeFixture.c_str());
+                       this->ExcludeFixture);
   }
   if (!this->ExcludeFixtureSetup.empty()) {
     handler->SetOption("ExcludeFixtureSetupRegularExpression",
-                       this->ExcludeFixtureSetup.c_str());
+                       this->ExcludeFixtureSetup);
   }
   if (!this->ExcludeFixtureCleanup.empty()) {
     handler->SetOption("ExcludeFixtureCleanupRegularExpression",
-                       this->ExcludeFixtureCleanup.c_str());
+                       this->ExcludeFixtureCleanup);
   }
   if (this->StopOnFailure) {
     handler->SetOption("StopOnFailure", "ON");
   }
   if (!this->ParallelLevel.empty()) {
-    handler->SetOption("ParallelLevel", this->ParallelLevel.c_str());
+    handler->SetOption("ParallelLevel", this->ParallelLevel);
   }
   if (!this->Repeat.empty()) {
-    handler->SetOption("Repeat", this->Repeat.c_str());
+    handler->SetOption("Repeat", this->Repeat);
   }
   if (!this->ScheduleRandom.empty()) {
-    handler->SetOption("ScheduleRandom", this->ScheduleRandom.c_str());
+    handler->SetOption("ScheduleRandom", this->ScheduleRandom);
   }
   if (!this->ResourceSpecFile.empty()) {
-    handler->SetOption("ResourceSpecFile", this->ResourceSpecFile.c_str());
+    handler->SetOption("ResourceSpecFile", this->ResourceSpecFile);
   }
   if (!this->StopTime.empty()) {
     this->CTest->SetStopTime(this->StopTime);
diff --git a/Source/CTest/cmCTestUpdateCommand.cxx b/Source/CTest/cmCTestUpdateCommand.cxx
index 797cb01..6655bf7 100644
--- a/Source/CTest/cmCTestUpdateCommand.cxx
+++ b/Source/CTest/cmCTestUpdateCommand.cxx
@@ -79,7 +79,7 @@ cmCTestGenericHandler* cmCTestUpdateCommand::InitializeHandler()
     this->SetError("source directory not specified. Please use SOURCE tag");
     return nullptr;
   }
-  handler->SetOption("SourceDirectory", source_dir.c_str());
+  handler->SetOption("SourceDirectory", source_dir);
   handler->SetQuiet(this->Quiet);
   return handler;
 }
-- 
cgit v0.12