summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-08-18 15:21:52 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-08-18 15:21:52 (GMT)
commitde547ca5c3053293d144b3c8b133f701d4b81150 (patch)
treedb6ba5ecffa862661cd8d6480c57bb7e081f044a
parentfc8a888d2cee0aeeea3b10a5b764ffb5cf71c212 (diff)
parent1412960e8974c2d50e4601982c0b0dccd2e20ed1 (diff)
downloadCMake-de547ca5c3053293d144b3c8b133f701d4b81150.zip
CMake-de547ca5c3053293d144b3c8b133f701d4b81150.tar.gz
CMake-de547ca5c3053293d144b3c8b133f701d4b81150.tar.bz2
Merge topic 'cmake-gui-system-version'
1412960e cmake-gui: Pass CMAKE_SYSTEM_VERSION from cross-compile configuration
-rw-r--r--Source/QtDialog/CMakeSetupDialog.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index 8a37797..0574681 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -756,6 +756,9 @@ bool CMakeSetupDialog::setupFirstConfigure()
QString systemName = dialog.getSystemName();
m->insertProperty(QCMakeProperty::STRING, "CMAKE_SYSTEM_NAME",
tr("CMake System Name"), systemName, false);
+ QString systemVersion = dialog.getSystemVersion();
+ m->insertProperty(QCMakeProperty::STRING, "CMAKE_SYSTEM_VERSION",
+ tr("CMake System Version"), systemVersion, false);
QString cxxCompiler = dialog.getCXXCompiler();
m->insertProperty(QCMakeProperty::FILEPATH, "CMAKE_CXX_COMPILER",
tr("CXX compiler."), cxxCompiler, false);