[Cmake-commits] CMake branch, master, updated. v3.9.0-rc5-216-gf973d49

[Kitware Robot]

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, master has been updated
       via  f973d49ab9d4c59b93f6dac812a94bb130200836 (commit)
       via  a57b3537504c055dbd72673816a672982cc3592d (commit)
       via  83d8aceeb35d2a378777a35fea1fb7d7c2d76362 (commit)
       via  82a5c2c6a56af5e51c5ec8ac30fda5e145087489 (commit)
      from  cdb43f1c887a0695468c18968943680435c7e625 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f973d49ab9d4c59b93f6dac812a94bb130200836
commit f973d49ab9d4c59b93f6dac812a94bb130200836
Merge: a57b353 82a5c2c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 5 14:11:11 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Jul 5 10:11:21 2017 -0400

    Merge topic 'vs-link-guard-cf'
    
    82a5c2c6 VS: Fix support for '/guard:cf' linker flag
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1018


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a57b3537504c055dbd72673816a672982cc3592d
commit a57b3537504c055dbd72673816a672982cc3592d
Merge: cdb43f1 83d8ace
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 5 14:10:52 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Jul 5 10:11:00 2017 -0400

    Merge topic 'autogen-header-skip'
    
    83d8acee Autogen: Check .moc header name against SKIP list
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1017


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83d8aceeb35d2a378777a35fea1fb7d7c2d76362
commit 83d8aceeb35d2a378777a35fea1fb7d7c2d76362
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Jun 30 13:26:18 2017 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 30 12:53:24 2017 -0400

    Autogen: Check .moc header name against SKIP list
    
    When encountering an #include "FOO.moc" statement where
    FOO.hpp was chosen over FOO.cpp as the moc source, the
    FOO.hpp name was not checked against the moc SKIP list.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 27e4928..6d3305b 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1003,7 +1003,7 @@ bool cmQtAutoGenerators::MocParseSourceContent(
             // In relaxed mode try to find a header instead but issue a warning
             const std::string headerToMoc =
               this->MocFindHeader(scannedFileAbsPath, incSubDir + incBasename);
-            if (!headerToMoc.empty()) {
+            if (!headerToMoc.empty() && !this->MocSkip(headerToMoc)) {
               // This is for KDE4 compatibility:
               fileToMoc = headerToMoc;
               if (!requiresMoc && (incBasename == scannedFileBasename)) {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82a5c2c6a56af5e51c5ec8ac30fda5e145087489
commit 82a5c2c6a56af5e51c5ec8ac30fda5e145087489
Author:     Olender, Sebastian D <sebastian.d.olender at intel.com>
AuthorDate: Fri Jun 30 16:06:44 2017 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 30 10:57:40 2017 -0400

    VS: Fix support for '/guard:cf' linker flag
    
    Although `$(VCTargetsPath)/1033/link.xml` for v140 and v141 toolsets
    contains an entry for `LinkControlFlowGuard`, it does not work when used
    in a `.vcxproj` file.  Drop our link flag table entries for these
    toolsets so that the flag will be passed via `AdditionalOptions`.

diff --git a/Source/cmVS140LinkFlagTable.h b/Source/cmVS140LinkFlagTable.h
index ceb1d78..b9a4dc3 100644
--- a/Source/cmVS140LinkFlagTable.h
+++ b/Source/cmVS140LinkFlagTable.h
@@ -134,9 +134,6 @@ static cmVS7FlagTable cmVS140LinkFlagTable[] = {
   { "CLRSupportLastError", "CLRSupportLastError:SYSTEMDLL", "System Dlls Only",
     "SystemDlls", 0 },
 
-  { "LinkControlFlowGuard", "guard:cf", "Enable Security Check with Guard",
-    "Guard", 0 },
-
   // Bool Properties
   { "LinkIncremental", "INCREMENTAL:NO", "", "false", 0 },
   { "LinkIncremental", "INCREMENTAL", "", "true", 0 },
diff --git a/Source/cmVS141LinkFlagTable.h b/Source/cmVS141LinkFlagTable.h
index d7faf81..8f0f1f4 100644
--- a/Source/cmVS141LinkFlagTable.h
+++ b/Source/cmVS141LinkFlagTable.h
@@ -135,9 +135,6 @@ static cmVS7FlagTable cmVS141LinkFlagTable[] = {
   { "CLRSupportLastError", "CLRSupportLastError:SYSTEMDLL", "System Dlls Only",
     "SystemDlls", 0 },
 
-  { "LinkControlFlowGuard", "guard:cf", "Enable Security Check with Guard",
-    "Guard", 0 },
-
   // Bool Properties
   { "LinkIncremental", "INCREMENTAL:NO", "", "false", 0 },
   { "LinkIncremental", "INCREMENTAL", "", "true", 0 },

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

Summary of changes:
 Source/cmQtAutoGenerators.cxx |    2 +-
 Source/cmVS140LinkFlagTable.h |    3 ---
 Source/cmVS141LinkFlagTable.h |    3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)


hooks/post-receive
-- 
CMake