diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-22 14:41:09 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-22 09:41:23 -0500 |
| commit | bcc9ea2b3d9cd3b882dbb2a23502b0392cb21d1b (patch) | |
| tree | 9945bdac4f46768194c0bee87863a1f50fd568a7 | |
| parent | ad2ed96a85ff2548222093723b923305732a79cb (diff) | |
| parent | ab3b549ee0dcd79607f8347a9b69c9b029590fbd (diff) | |
| download | cmake-bcc9ea2b3d9cd3b882dbb2a23502b0392cb21d1b.tar.gz | |
Merge topic 'crosscompiling_emulator-fix'
ab3b549ee0 CROSSCOMPILING_EMULATOR: Fix test generation for empty value
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2834
| -rw-r--r-- | Source/cmTestGenerator.cxx | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CrosscompilingEmulator/CrosscompilingEmulatorProperty.cmake | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx index 1e2ddc7b90..603270153e 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]); diff --git a/Tests/RunCMake/CrosscompilingEmulator/CrosscompilingEmulatorProperty.cmake b/Tests/RunCMake/CrosscompilingEmulator/CrosscompilingEmulatorProperty.cmake index 1aeb510f0c..2fdefc4ce7 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/CrosscompilingEmulatorProperty.cmake +++ b/Tests/RunCMake/CrosscompilingEmulator/CrosscompilingEmulatorProperty.cmake @@ -26,3 +26,9 @@ get_property(emulator TARGET target_without_emulator if(NOT "${emulator}" STREQUAL "") message(SEND_ERROR "Default CROSSCOMPILING_EMULATOR property not set to null") endif() + +add_executable(target_with_empty_emulator simple_src_exiterror.cxx) +set_property(TARGET target_with_empty_emulator PROPERTY CROSSCOMPILING_EMULATOR "") + +enable_testing() +add_test(NAME test_target_with_empty_emulator COMMAND target_with_empty_emulator) |