summaryrefslogtreecommitdiffstats
path: root/Source/cmTestGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-01-22 14:41:09 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-01-22 14:41:23 (GMT)
commitbcc9ea2b3d9cd3b882dbb2a23502b0392cb21d1b (patch)
tree9945bdac4f46768194c0bee87863a1f50fd568a7 /Source/cmTestGenerator.cxx
parentad2ed96a85ff2548222093723b923305732a79cb (diff)
parentab3b549ee0dcd79607f8347a9b69c9b029590fbd (diff)
downloadCMake-bcc9ea2b3d9cd3b882dbb2a23502b0392cb21d1b.zip
CMake-bcc9ea2b3d9cd3b882dbb2a23502b0392cb21d1b.tar.gz
CMake-bcc9ea2b3d9cd3b882dbb2a23502b0392cb21d1b.tar.bz2
Merge topic 'crosscompiling_emulator-fix'
ab3b549ee0 CROSSCOMPILING_EMULATOR: Fix test generation for empty value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2834
Diffstat (limited to 'Source/cmTestGenerator.cxx')
-rw-r--r--Source/cmTestGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index 1e2ddc7..6032701 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -90,7 +90,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
// Prepend with the emulator when cross compiling if required.
const char* emulator = target->GetProperty("CROSSCOMPILING_EMULATOR");
- if (emulator != nullptr) {
+ if (emulator != nullptr && *emulator) {
std::vector<std::string> emulatorWithArgs;
cmSystemTools::ExpandListArgument(emulator, emulatorWithArgs);
std::string emulatorExe(emulatorWithArgs[0]);