summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2023-11-29 19:39:23 (GMT)
committerBrad King <brad.king@kitware.com>2023-12-13 15:20:43 (GMT)
commit88863d83d62b7668047ee78a3ada841364e119a0 (patch)
tree7af47ede9f38acae8a2c6cc3ccd85cac5eb1a13d /Source
parent1ec0372ed4b450e242fdb8f6a7d2862baa61b501 (diff)
downloadCMake-88863d83d62b7668047ee78a3ada841364e119a0.zip
CMake-88863d83d62b7668047ee78a3ada841364e119a0.tar.gz
CMake-88863d83d62b7668047ee78a3ada841364e119a0.tar.bz2
fileapi: Add test launcher to codemodel-v2
We do not need to bump the minor version because it was recently bumped by addition of the cross-compiling emulator as another kind of launcher.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmFileAPICodemodel.cxx13
1 files changed, 8 insertions, 5 deletions
diff --git a/Source/cmFileAPICodemodel.cxx b/Source/cmFileAPICodemodel.cxx
index e67d91f..30a7e67 100644
--- a/Source/cmFileAPICodemodel.cxx
+++ b/Source/cmFileAPICodemodel.cxx
@@ -2112,15 +2112,18 @@ Json::Value Target::DumpLauncher(const char* name, const char* type)
Json::Value Target::DumpLaunchers()
{
Json::Value launchers;
- bool allow =
- this->GT->Makefile->GetDefinition("CMAKE_CROSSCOMPILING").IsOn();
- Json::Value launcher;
- if (allow) {
- launcher = DumpLauncher("CROSSCOMPILING_EMULATOR", "emulator");
+ {
+ Json::Value launcher = DumpLauncher("TEST_LAUNCHER", "test");
if (!launcher.empty()) {
launchers.append(std::move(launcher));
}
}
+ if (this->GT->Makefile->IsOn("CMAKE_CROSSCOMPILING")) {
+ Json::Value emulator = DumpLauncher("CROSSCOMPILING_EMULATOR", "emulator");
+ if (!emulator.empty()) {
+ launchers.append(std::move(emulator));
+ }
+ }
return launchers;
}
}