[Cmake-commits] CMake branch, next, updated. v3.0.1-4893-ga776a67

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a776a67a07f057be07da744532b239781889bfc4 (commit)
       via  1412960e8974c2d50e4601982c0b0dccd2e20ed1 (commit)
      from  457cf2d45d9375dc0d364afe3162495f810546d5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a776a67a07f057be07da744532b239781889bfc4
commit a776a67a07f057be07da744532b239781889bfc4
Merge: 457cf2d 1412960
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 13 10:19:14 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 13 10:19:14 2014 -0400

    Merge topic 'cmake-gui-system-version' into next
    
    1412960e cmake-gui: Pass CMAKE_SYSTEM_VERSION from cross-compile configuration


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1412960e8974c2d50e4601982c0b0dccd2e20ed1
commit 1412960e8974c2d50e4601982c0b0dccd2e20ed1
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Tue Aug 12 14:18:00 2014 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 13 10:17:31 2014 -0400

    cmake-gui: Pass CMAKE_SYSTEM_VERSION from cross-compile configuration
    
    Although this value can be configured in the dialog, it was simply not
    passed to the project as CMAKE_SYSTEM_VERSION.  Fix that.

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);

-----------------------------------------------------------------------

Summary of changes:
 Source/QtDialog/CMakeSetupDialog.cxx |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake