diff options
| author | Brad King <brad.king@kitware.com> | 2023-12-15 14:34:09 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-12-15 14:34:20 (GMT) |
| commit | 6ba3bb0563ca72fa6fa7bc705bdf38187e3fa485 (patch) | |
| tree | b44461db107bee8b705602e2316721113d1451cc /Source/cmake.cxx | |
| parent | 6a67f71b57cef80f51bd225049198e80f325846b (diff) | |
| parent | 88863d83d62b7668047ee78a3ada841364e119a0 (diff) | |
| download | CMake-6ba3bb0563ca72fa6fa7bc705bdf38187e3fa485.zip CMake-6ba3bb0563ca72fa6fa7bc705bdf38187e3fa485.tar.gz CMake-6ba3bb0563ca72fa6fa7bc705bdf38187e3fa485.tar.bz2 | |
Merge topic 'cmake-test-launcher'
88863d83d6 fileapi: Add test launcher to codemodel-v2
1ec0372ed4 add_test: Optionally use a launcher for tests running in-project targets
478a5f4e04 fileapi: Make launcher attribute 'arguments' optional
b44e38a397 cmFileAPICodemodel: Add missing std::move()
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8963
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index a25147a..fd22957 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -2515,6 +2515,16 @@ int cmake::ActualConfigure() "Name of generator toolset.", cmStateEnums::INTERNAL); } + if (!this->State->GetInitializedCacheValue("CMAKE_TEST_LAUNCHER")) { + cm::optional<std::string> testLauncher = + cmSystemTools::GetEnvVar("CMAKE_TEST_LAUNCHER"); + if (testLauncher && !testLauncher->empty()) { + std::string message = "Test launcher to run tests executable."; + this->AddCacheEntry("CMAKE_TEST_LAUNCHER", *testLauncher, message, + cmStateEnums::STRING); + } + } + if (!this->State->GetInitializedCacheValue( "CMAKE_CROSSCOMPILING_EMULATOR")) { cm::optional<std::string> emulator = |