[Cmake-commits] CMake branch, next, updated. v2.8.11.2-2989-g6decd3d

[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  6decd3d707551934dc2850dbc403000f8608fdf4 (commit)
       via  f2caf795febe5809500666360dbcb6fe9f59ac77 (commit)
      from  ad588804f2ae95b0825ca97affe6605c05d966cb (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=6decd3d707551934dc2850dbc403000f8608fdf4
commit 6decd3d707551934dc2850dbc403000f8608fdf4
Merge: ad58880 f2caf79
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 9 14:09:38 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 9 14:09:38 2013 -0400

    Merge topic 'vs-flag-MAP-with-value' into next
    
    f2caf79 VS: Fix /MAP:mapfile flag mapping (#14282)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2caf795febe5809500666360dbcb6fe9f59ac77
commit f2caf795febe5809500666360dbcb6fe9f59ac77
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 9 10:07:18 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 9 10:13:43 2013 -0400

    VS: Fix /MAP:mapfile flag mapping (#14282)
    
    We have two mappings for the "/MAP" flag.  The first does not care
    whether there is a value and activates the GenerateMapFile boolean
    setting.  The second takes a value and puts it in the MapFileName
    setting.  The latter must treat the ":" as part of the flag.
    
    This is similar to commit 8ae66bf4 (Fix optionally-valued booleans in VS
    10 flag table, 2009-10-23).

diff --git a/Source/cmVS10LinkFlagTable.h b/Source/cmVS10LinkFlagTable.h
index 64febbb..5d15620 100644
--- a/Source/cmVS10LinkFlagTable.h
+++ b/Source/cmVS10LinkFlagTable.h
@@ -201,7 +201,7 @@ static cmVS7FlagTable cmVS10LinkFlagTable[] =
    cmVS7FlagTable::UserValueRequired},
   {"GenerateMapFile", "MAP", "", "true",
    cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue},
-  {"MapFileName", "MAP", "Generate Map File", "",
+  {"MapFileName", "MAP:", "Generate Map File", "",
    cmVS7FlagTable::UserValueRequired},
 
   //String List Properties
diff --git a/Source/cmVS11LinkFlagTable.h b/Source/cmVS11LinkFlagTable.h
index ea0d0f0..b4587a8 100644
--- a/Source/cmVS11LinkFlagTable.h
+++ b/Source/cmVS11LinkFlagTable.h
@@ -227,7 +227,7 @@ static cmVS7FlagTable cmVS11LinkFlagTable[] =
    cmVS7FlagTable::UserValueRequired},
   {"GenerateMapFile", "MAP", "", "true",
    cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue},
-  {"MapFileName", "MAP", "Generate Map File", "",
+  {"MapFileName", "MAP:", "Generate Map File", "",
    cmVS7FlagTable::UserValueRequired},
 
   //String List Properties
diff --git a/Source/cmVS12LinkFlagTable.h b/Source/cmVS12LinkFlagTable.h
index ce32e38..73d450a 100644
--- a/Source/cmVS12LinkFlagTable.h
+++ b/Source/cmVS12LinkFlagTable.h
@@ -227,7 +227,7 @@ static cmVS7FlagTable cmVS12LinkFlagTable[] =
    cmVS7FlagTable::UserValueRequired},
   {"GenerateMapFile", "MAP", "", "true",
    cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue},
-  {"MapFileName", "MAP", "Generate Map File", "",
+  {"MapFileName", "MAP:", "Generate Map File", "",
    cmVS7FlagTable::UserValueRequired},
 
   //String List Properties

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

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


hooks/post-receive
-- 
CMake