[Cmake-commits] [cmake-commits] king committed cmGlobalVisualStudio7Generator.h 1.46 1.47

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Jan 21 17:36:08 EST 2009


Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv7074/Source

Modified Files:
	cmGlobalVisualStudio7Generator.h 
Log Message:
BUG: Fix VS IDE solution files order again

The previous change to order projects in the VS IDE did not account for
duplicate target names (such as ALL_BUILD and ZERO_CHECK) among the
input set.  While we suppress generation of the duplicate project
entries, we need to use a multiset to store ordered duplicates.


Index: cmGlobalVisualStudio7Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio7Generator.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -C 2 -d -r1.46 -r1.47
*** cmGlobalVisualStudio7Generator.h	21 Jan 2009 21:39:43 -0000	1.46
--- cmGlobalVisualStudio7Generator.h	21 Jan 2009 22:36:06 -0000	1.47
***************
*** 120,124 ****
    virtual void AddPlatformDefinitions(cmMakefile* mf);
  
!   class OrderedTargetDependSet: public std::set<cmTarget*, TargetCompare>
    {
    public:
--- 120,124 ----
    virtual void AddPlatformDefinitions(cmMakefile* mf);
  
!   class OrderedTargetDependSet: public std::multiset<cmTarget*, TargetCompare>
    {
    public:



More information about the Cmake-commits mailing list