[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3009-g2fb3919

[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  2fb3919f6c8c4582d9ca641f9ccea486d1fa2fae (commit)
       via  9c7f234ceb9a74e2d79e653cbeaece9bfc6211fd (commit)
      from  4dc945843756a758ea8dca1b255546392835e725 (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=2fb3919f6c8c4582d9ca641f9ccea486d1fa2fae
commit 2fb3919f6c8c4582d9ca641f9ccea486d1fa2fae
Merge: 4dc9458 9c7f234
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 7 15:30:43 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 7 15:30:43 2014 -0400

    Merge topic 'vs-fix-MANIFESTUAC' into next
    
    9c7f234c VS: Fix /MANIFESTUAC:NO linker option mapping


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c7f234ceb9a74e2d79e653cbeaece9bfc6211fd
commit 9c7f234ceb9a74e2d79e653cbeaece9bfc6211fd
Author:     Eric Berge <ericmberge at gmail.com>
AuthorDate: Wed May 7 13:56:12 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 7 15:24:08 2014 -0400

    VS: Fix /MANIFESTUAC:NO linker option mapping
    
    There are no versions of /MANIFESTUAC:NO where addition values are
    appended.  Remove both of the MANIFESTUAC:NO entries from our flag
    tables and replace them with one which would set EnableUAC to false and
    immediately stop processing the /MANIFESTUAC:NO option.

diff --git a/Source/cmVS10LinkFlagTable.h b/Source/cmVS10LinkFlagTable.h
index 5d15620..f6b758d 100644
--- a/Source/cmVS10LinkFlagTable.h
+++ b/Source/cmVS10LinkFlagTable.h
@@ -191,10 +191,7 @@ static cmVS7FlagTable cmVS10LinkFlagTable[] =
   {"LinkDLL", "DLL", "", "true", 0},
 
   //Bool Properties With Argument
-  {"EnableUAC", "MANIFESTUAC:NO", "", "false",
-   cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue},
-  {"EnableUAC", "MANIFESTUAC:NO", "Enable User Account Control (UAC)", "",
-   cmVS7FlagTable::UserValueRequired},
+  {"EnableUAC", "MANIFESTUAC:NO", "", "false", 0},
   {"EnableUAC", "MANIFESTUAC:", "", "true",
    cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue},
   {"UACUIAccess", "MANIFESTUAC:", "Enable User Account Control (UAC)", "",
diff --git a/Source/cmVS11LinkFlagTable.h b/Source/cmVS11LinkFlagTable.h
index b4587a8..0f641e4 100644
--- a/Source/cmVS11LinkFlagTable.h
+++ b/Source/cmVS11LinkFlagTable.h
@@ -217,10 +217,7 @@ static cmVS7FlagTable cmVS11LinkFlagTable[] =
   {"LinkDLL", "DLL", "", "true", 0},
 
   //Bool Properties With Argument
-  {"EnableUAC", "MANIFESTUAC:NO", "", "false",
-   cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue},
-  {"EnableUAC", "MANIFESTUAC:NO", "Enable User Account Control (UAC)", "",
-   cmVS7FlagTable::UserValueRequired},
+  {"EnableUAC", "MANIFESTUAC:NO", "", "false", 0},
   {"EnableUAC", "MANIFESTUAC:", "", "true",
    cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue},
   {"UACUIAccess", "MANIFESTUAC:", "Enable User Account Control (UAC)", "",
diff --git a/Source/cmVS12LinkFlagTable.h b/Source/cmVS12LinkFlagTable.h
index 73d450a..e5a570e 100644
--- a/Source/cmVS12LinkFlagTable.h
+++ b/Source/cmVS12LinkFlagTable.h
@@ -217,10 +217,7 @@ static cmVS7FlagTable cmVS12LinkFlagTable[] =
   {"LinkDLL", "DLL", "", "true", 0},
 
   //Bool Properties With Argument
-  {"EnableUAC", "MANIFESTUAC:NO", "", "false",
-   cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue},
-  {"EnableUAC", "MANIFESTUAC:NO", "Enable User Account Control (UAC)", "",
-   cmVS7FlagTable::UserValueRequired},
+  {"EnableUAC", "MANIFESTUAC:NO", "", "false", 0},
   {"EnableUAC", "MANIFESTUAC:", "", "true",
    cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue},
   {"UACUIAccess", "MANIFESTUAC:", "Enable User Account Control (UAC)", "",

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

Summary of changes:
 Source/cmVS10LinkFlagTable.h |    5 +----
 Source/cmVS11LinkFlagTable.h |    5 +----
 Source/cmVS12LinkFlagTable.h |    5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake