[Cmake-commits] CMake branch, next, updated. v3.1.0-1739-g16e597e

[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  16e597ec9e3e2e7fee69d8b8a150a413a24d0dc0 (commit)
       via  7c585699304ac071cdf7c1b8d7677d38b859e70f (commit)
      from  dda9962f80194e91ab395859ab9caf8dc7c8523d (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=16e597ec9e3e2e7fee69d8b8a150a413a24d0dc0
commit 16e597ec9e3e2e7fee69d8b8a150a413a24d0dc0
Merge: dda9962 7c58569
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Jan 11 15:12:02 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 11 15:12:02 2015 -0500

    Merge topic 'fix-autouic-regression' into next
    
    7c585699 QtAutoUic: Restore source file AUTOUIC_OPTIONS settings


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c585699304ac071cdf7c1b8d7677d38b859e70f
commit 7c585699304ac071cdf7c1b8d7677d38b859e70f
Author:     Justin Borodinsky <justin.borodinsky at gmail.com>
AuthorDate: Thu Jan 1 14:20:14 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Jan 11 15:11:18 2015 -0500

    QtAutoUic: Restore source file AUTOUIC_OPTIONS settings
    
    The "." in the extension was dropped by commit v3.1.0-rc1~556^2~2
    (cmSourceFile: Cache the isUiFile check, 2014-02-08) by mistake.  This
    caused the options to not be set.

diff --git a/Source/cmSourceFile.cxx b/Source/cmSourceFile.cxx
index b833d3f..12eb411 100644
--- a/Source/cmSourceFile.cxx
+++ b/Source/cmSourceFile.cxx
@@ -24,7 +24,7 @@ cmSourceFile::cmSourceFile(cmMakefile* mf, const std::string& name):
   this->CustomCommand = 0;
   this->Properties.SetCMakeInstance(mf->GetCMakeInstance());
   this->FindFullPathFailed = false;
-  this->IsUiFile = ("ui" ==
+  this->IsUiFile = (".ui" ==
           cmSystemTools::GetFilenameLastExtension(this->Location.GetName()));
 }
 

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

Summary of changes:
 Source/cmSourceFile.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake