[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.419 1.420 cmGlobalVisualStudio7Generator.cxx 1.107 1.108 cmGlobalVisualStudio7Generator.h 1.49 1.50 cmGlobalVisualStudio8Generator.cxx 1.37 1.38 cmGlobalVisualStudio8Generator.h 1.13 1.14 cmIDEFlagTable.h NONE 1.1 cmLocalVisualStudio7Generator.h 1.58 1.59 cmVisualStudioGeneratorOptions.h 1.1 1.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Jul 29 11:28:57 EDT 2009
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv4380/Source
Modified Files:
CMakeLists.txt cmGlobalVisualStudio7Generator.cxx
cmGlobalVisualStudio7Generator.h
cmGlobalVisualStudio8Generator.cxx
cmGlobalVisualStudio8Generator.h
cmLocalVisualStudio7Generator.h
cmVisualStudioGeneratorOptions.h
Added Files:
cmIDEFlagTable.h
Log Message:
ENH: Separate VS flag table type
Move the cmVS7FlagTable type out of the VS generators and rename it to
cmIDEFlagTable. It will be useful for other generators.
Index: cmLocalVisualStudio7Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -C 2 -d -r1.58 -r1.59
*** cmLocalVisualStudio7Generator.h 28 Jul 2009 18:30:15 -0000 1.58
--- cmLocalVisualStudio7Generator.h 29 Jul 2009 15:28:54 -0000 1.59
***************
*** 19,23 ****
#include "cmLocalVisualStudioGenerator.h"
! #include "cmVisualStudioGeneratorOptions.h" // to get cmVS7FlagTable
class cmTarget;
--- 19,23 ----
#include "cmLocalVisualStudioGenerator.h"
! #include "cmVisualStudioGeneratorOptions.h"
class cmTarget;
Index: cmGlobalVisualStudio8Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio8Generator.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C 2 -d -r1.13 -r1.14
*** cmGlobalVisualStudio8Generator.h 15 Feb 2008 16:49:58 -0000 1.13
--- cmGlobalVisualStudio8Generator.h 29 Jul 2009 15:28:54 -0000 1.14
***************
*** 68,72 ****
virtual bool VSLinksDependencies() const { return false; }
! static cmVS7FlagTable const* GetExtraFlagTableVS8();
virtual void AddPlatformDefinitions(cmMakefile* mf);
virtual void WriteSLNFile(std::ostream& fout, cmLocalGenerator* root,
--- 68,72 ----
virtual bool VSLinksDependencies() const { return false; }
! static cmIDEFlagTable const* GetExtraFlagTableVS8();
virtual void AddPlatformDefinitions(cmMakefile* mf);
virtual void WriteSLNFile(std::ostream& fout, cmLocalGenerator* root,
Index: cmGlobalVisualStudio8Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio8Generator.cxx,v
retrieving revision 1.37
retrieving revision 1.38
diff -C 2 -d -r1.37 -r1.38
*** cmGlobalVisualStudio8Generator.cxx 1 Apr 2008 21:39:04 -0000 1.37
--- cmGlobalVisualStudio8Generator.cxx 29 Jul 2009 15:28:54 -0000 1.38
***************
*** 349,353 ****
{0,0,0,0,0}
};
! cmVS7FlagTable const* cmGlobalVisualStudio8Generator::GetExtraFlagTableVS8()
{
return cmVS8ExtraFlagTable;
--- 349,353 ----
{0,0,0,0,0}
};
! cmIDEFlagTable const* cmGlobalVisualStudio8Generator::GetExtraFlagTableVS8()
{
return cmVS8ExtraFlagTable;
Index: cmVisualStudioGeneratorOptions.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmVisualStudioGeneratorOptions.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** cmVisualStudioGeneratorOptions.h 25 Jun 2009 20:41:56 -0000 1.1
--- cmVisualStudioGeneratorOptions.h 29 Jul 2009 15:28:55 -0000 1.2
***************
*** 19,48 ****
#include "cmLocalGenerator.h"
- class cmVisualStudio10TargetGenerator;
! // This is a table mapping XML tag IDE names to command line options
! struct cmVS7FlagTable
! {
! const char* IDEName; // name used in the IDE xml file
! const char* commandFlag; // command line flag
! const char* comment; // comment
! const char* value; // string value
! unsigned int special; // flags for special handling requests
! enum
! {
! UserValue = (1<<0), // flag contains a user-specified value
! UserIgnored = (1<<1), // ignore any user value
! UserRequired = (1<<2), // match only when user value is non-empty
! Continue = (1<<3), // continue looking for matching entries
! SemicolonAppendable = (1<<4), // a flag that if specified multiple times
! // should have its value appended to the
! // old value with semicolons (e.g.
! // /NODEFAULTLIB: =>
! // IgnoreDefaultLibraryNames)
! UserValueIgnored = UserValue | UserIgnored,
! UserValueRequired = UserValue | UserRequired
! };
! };
//----------------------------------------------------------------------------
--- 19,27 ----
#include "cmLocalGenerator.h"
! #include "cmIDEFlagTable.h"
! typedef cmIDEFlagTable cmVS7FlagTable;
! class cmVisualStudio10TargetGenerator;
//----------------------------------------------------------------------------
--- NEW FILE: cmIDEFlagTable.h ---
/*=========================================================================
Program: CMake - Cross-Platform Makefile Generator
Module: $RCSfile: cmIDEFlagTable.h,v $
Language: C++
Date: $Date: 2009-07-29 15:28:54 $
Version: $Revision: 1.1 $
Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef cmIDEFlagTable_h
#define cmIDEFlagTable_h
// This is a table mapping XML tag IDE names to command line options
struct cmIDEFlagTable
{
const char* IDEName; // name used in the IDE xml file
const char* commandFlag; // command line flag
const char* comment; // comment
const char* value; // string value
unsigned int special; // flags for special handling requests
enum
{
UserValue = (1<<0), // flag contains a user-specified value
UserIgnored = (1<<1), // ignore any user value
UserRequired = (1<<2), // match only when user value is non-empty
Continue = (1<<3), // continue looking for matching entries
SemicolonAppendable = (1<<4), // a flag that if specified multiple times
// should have its value appended to the
// old value with semicolons (e.g.
// /NODEFAULTLIB: =>
// IgnoreDefaultLibraryNames)
UserValueIgnored = UserValue | UserIgnored,
UserValueRequired = UserValue | UserRequired
};
};
#endif
Index: cmGlobalVisualStudio7Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio7Generator.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -C 2 -d -r1.49 -r1.50
*** cmGlobalVisualStudio7Generator.h 14 Jul 2009 18:16:46 -0000 1.49
--- cmGlobalVisualStudio7Generator.h 29 Jul 2009 15:28:54 -0000 1.50
***************
*** 21,25 ****
class cmTarget;
! struct cmVS7FlagTable;
/** \class cmGlobalVisualStudio7Generator
--- 21,25 ----
class cmTarget;
! struct cmIDEFlagTable;
/** \class cmGlobalVisualStudio7Generator
***************
*** 104,108 ****
protected:
! static cmVS7FlagTable const* GetExtraFlagTableVS7();
virtual void OutputSLNFile(cmLocalGenerator* root,
std::vector<cmLocalGenerator*>& generators);
--- 104,108 ----
protected:
! static cmIDEFlagTable const* GetExtraFlagTableVS7();
virtual void OutputSLNFile(cmLocalGenerator* root,
std::vector<cmLocalGenerator*>& generators);
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CMakeLists.txt,v
retrieving revision 1.419
retrieving revision 1.420
diff -C 2 -d -r1.419 -r1.420
*** CMakeLists.txt 22 Jul 2009 18:22:45 -0000 1.419
--- CMakeLists.txt 29 Jul 2009 15:28:52 -0000 1.420
***************
*** 296,299 ****
--- 296,300 ----
cmGlobalVisualStudioGenerator.h
cmGlobalWatcomWMakeGenerator.cxx
+ cmIDEFlagTable.h
cmLocalVisualStudio6Generator.cxx
cmLocalVisualStudio6Generator.h
Index: cmGlobalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio7Generator.cxx,v
retrieving revision 1.107
retrieving revision 1.108
diff -C 2 -d -r1.107 -r1.108
*** cmGlobalVisualStudio7Generator.cxx 14 Jul 2009 18:16:46 -0000 1.107
--- cmGlobalVisualStudio7Generator.cxx 29 Jul 2009 15:28:53 -0000 1.108
***************
*** 717,721 ****
{0,0,0,0,0}
};
! cmVS7FlagTable const* cmGlobalVisualStudio7Generator::GetExtraFlagTableVS7()
{
return cmVS7ExtraFlagTable;
--- 717,721 ----
{0,0,0,0,0}
};
! cmIDEFlagTable const* cmGlobalVisualStudio7Generator::GetExtraFlagTableVS7()
{
return cmVS7ExtraFlagTable;
More information about the Cmake-commits
mailing list