From a8b7dd061b1c289ffd8f7f5c2e82efc0b57a68e8 Mon Sep 17 00:00:00 2001
From: Zack Galbreath <zack.galbreath@kitware.com>
Date: Mon, 28 Sep 2020 12:55:45 -0400
Subject: ctest: improve Unicode support for launchers

Fix launcher behavior for international characters in the path on Windows.
---
 Source/CTest/cmCTestLaunchReporter.cxx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Source/CTest/cmCTestLaunchReporter.cxx b/Source/CTest/cmCTestLaunchReporter.cxx
index 41e725f..6ec7d0e 100644
--- a/Source/CTest/cmCTestLaunchReporter.cxx
+++ b/Source/CTest/cmCTestLaunchReporter.cxx
@@ -2,8 +2,6 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCTestLaunchReporter.h"
 
-#include <cstdlib>
-
 #include "cmsys/FStream.hxx"
 #include "cmsys/Process.h"
 #include "cmsys/RegularExpression.hxx"
@@ -48,8 +46,8 @@ void cmCTestLaunchReporter::ComputeFileNames()
 {
   // We just passthru the behavior of the real command unless the
   // CTEST_LAUNCH_LOGS environment variable is set.
-  const char* d = getenv("CTEST_LAUNCH_LOGS");
-  if (!(d && *d)) {
+  std::string d;
+  if (!cmSystemTools::GetEnv("CTEST_LAUNCH_LOGS", d) || d.empty()) {
     return;
   }
   this->Passthru = false;
-- 
cgit v0.12