4 files changed, 8 insertions, 7 deletions
diff --git a/Modules/ExternalProject/gitclone.cmake.in b/Modules/ExternalProject/gitclone.cmake.in
index 93424ed..b80bcb1 100644
--- a/Modules/ExternalProject/gitclone.cmake.in
+++ b/Modules/ExternalProject/gitclone.cmake.in
@@ -16,7 +16,7 @@ endif()
 # enabling them to be shown for DEBUG may be useful to help diagnose problems.
 cmake_language(GET_MESSAGE_LOG_LEVEL active_log_level)
 if(active_log_level MATCHES "DEBUG|TRACE")
-  set(maybe_show_command "COMMAND_ECHO STDOUT")
+  set(maybe_show_command COMMAND_ECHO STDOUT)
 else()
   set(maybe_show_command "")
 endif()
diff --git a/Modules/ExternalProject/gitupdate.cmake.in b/Modules/ExternalProject/gitupdate.cmake.in
index 4e3fba6..fb0c6a6 100644
--- a/Modules/ExternalProject/gitupdate.cmake.in
+++ b/Modules/ExternalProject/gitupdate.cmake.in
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.5)
 # enabling them to be shown for DEBUG may be useful to help diagnose problems.
 cmake_language(GET_MESSAGE_LOG_LEVEL active_log_level)
 if(active_log_level MATCHES "DEBUG|TRACE")
-  set(maybe_show_command "COMMAND_ECHO STDOUT")
+  set(maybe_show_command COMMAND_ECHO STDOUT)
 else()
   set(maybe_show_command "")
 endif()
diff --git a/Modules/ExternalProject/hgclone.cmake.in b/Modules/ExternalProject/hgclone.cmake.in
index 993ab7f..96449aa 100644
--- a/Modules/ExternalProject/hgclone.cmake.in
+++ b/Modules/ExternalProject/hgclone.cmake.in
@@ -16,7 +16,7 @@ endif()
 # enabling them to be shown for DEBUG may be useful to help diagnose problems.
 cmake_language(GET_MESSAGE_LOG_LEVEL active_log_level)
 if(active_log_level MATCHES "DEBUG|TRACE")
-  set(maybe_show_command "COMMAND_ECHO STDOUT")
+  set(maybe_show_command COMMAND_ECHO STDOUT)
 else()
   set(maybe_show_command "")
 endif()
diff --git a/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake b/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake
index 3c7cd68..98e3996 100644
--- a/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake
@@ -15,9 +15,6 @@ endif()
 
 run_cmake(BadIndependentStep1)
 run_cmake(BadIndependentStep2)
-run_cmake(TLSVersionBadArg)
-run_cmake(TLSVersionBadVar)
-run_cmake(TLSVersionBadEnv)
 run_cmake(NoOptions)
 run_cmake(SourceEmpty)
 run_cmake(SourceMissing)
@@ -256,5 +253,9 @@ if(GIT_EXECUTABLE)
   # on some platforms. It may go to stdout or stderr, so force it to be merged.
   set(RunCMake_TEST_OUTPUT_MERGE TRUE)
   run_cmake(FetchGitRefs)
-  set(RunCMake_TEST_OUTPUT_MERGE FALSE)
+  unset(RunCMake_TEST_OUTPUT_MERGE)
+
+  run_cmake(TLSVersionBadArg)
+  run_cmake(TLSVersionBadVar)
+  run_cmake(TLSVersionBadEnv)
 endif()