diff options
| author | Jiri Malak <malak.jiri@gmail.com> | 2020-04-26 09:51:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-04-27 15:12:25 (GMT) |
| commit | 7a0c17f7041e635d089f16c056b7f1468804f3ed (patch) | |
| tree | 5bd7aff016f8a96d3558af383e4bbff0e3c48b46 /Source/QtDialog | |
| parent | eadafe2ebc419414fba42a3fe28b534bb2fc7a93 (diff) | |
| download | CMake-7a0c17f7041e635d089f16c056b7f1468804f3ed.zip CMake-7a0c17f7041e635d089f16c056b7f1468804f3ed.tar.gz CMake-7a0c17f7041e635d089f16c056b7f1468804f3ed.tar.bz2 | |
cmake-gui: Do not pass CMAKE_{C,CXX}_COMPILER items to cmake if empty
If C or C++ compiler is not specified in the initial dialog, do not pass
`CMAKE_C_COMPILER` or `CMAKE_CXX_COMPILER` cache entries for
cross-compilation setup. Instead allow the normal search for the
compiler to proceed.
Diffstat (limited to 'Source/QtDialog')
| -rw-r--r-- | Source/QtDialog/CMakeSetupDialog.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx index 4daf726..930f300 100644 --- a/Source/QtDialog/CMakeSetupDialog.cxx +++ b/Source/QtDialog/CMakeSetupDialog.cxx @@ -808,11 +808,15 @@ bool CMakeSetupDialog::setupFirstConfigure() m->insertProperty(QCMakeProperty::STRING, "CMAKE_SYSTEM_PROCESSOR", tr("CMake System Processor"), systemProcessor, false); QString cxxCompiler = dialog.getCXXCompiler(); - m->insertProperty(QCMakeProperty::FILEPATH, "CMAKE_CXX_COMPILER", - tr("CXX compiler."), cxxCompiler, false); + if (!cxxCompiler.isEmpty()) { + m->insertProperty(QCMakeProperty::FILEPATH, "CMAKE_CXX_COMPILER", + tr("CXX compiler."), cxxCompiler, false); + } QString cCompiler = dialog.getCCompiler(); - m->insertProperty(QCMakeProperty::FILEPATH, "CMAKE_C_COMPILER", - tr("C compiler."), cCompiler, false); + if (!cCompiler.isEmpty()) { + m->insertProperty(QCMakeProperty::FILEPATH, "CMAKE_C_COMPILER", + tr("C compiler."), cCompiler, false); + } } else if (dialog.crossCompilerToolChainFile()) { QString toolchainFile = dialog.getCrossCompilerToolChainFile(); m->insertProperty(QCMakeProperty::FILEPATH, "CMAKE_TOOLCHAIN_FILE", |