[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.429 1.430 cmGlobalVisualStudio10Generator.cxx 1.3 1.4 cmGlobalVisualStudio10Win64Generator.cxx NONE 1.1 cmGlobalVisualStudio10Win64Generator.h NONE 1.1 cmGlobalVisualStudio8Generator.h 1.19 1.20 cmLocalVisualStudio10Generator.cxx 1.6 1.7 cmVisualStudio10TargetGenerator.cxx 1.21 1.22 cmVisualStudio10TargetGenerator.h 1.8 1.9 cmake.cxx 1.435 1.436
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Oct 22 08:24:14 EDT 2009
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv22849/Source
Modified Files:
CMakeLists.txt cmGlobalVisualStudio10Generator.cxx
cmGlobalVisualStudio8Generator.h
cmLocalVisualStudio10Generator.cxx
cmVisualStudio10TargetGenerator.cxx
cmVisualStudio10TargetGenerator.h cmake.cxx
Added Files:
cmGlobalVisualStudio10Win64Generator.cxx
cmGlobalVisualStudio10Win64Generator.h
Log Message:
WIP: VS 10 Win64 generator
See issue #9754.
Index: cmGlobalVisualStudio10Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio10Generator.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** cmGlobalVisualStudio10Generator.cxx 28 Sep 2009 15:42:41 -0000 1.3
--- cmGlobalVisualStudio10Generator.cxx 22 Oct 2009 12:23:57 -0000 1.4
***************
*** 38,42 ****
cmLocalGenerator *cmGlobalVisualStudio10Generator::CreateLocalGenerator()
{
! cmLocalGenerator*lg = new cmLocalVisualStudio10Generator;
lg->SetGlobalGenerator(this);
return lg;
--- 38,43 ----
cmLocalGenerator *cmGlobalVisualStudio10Generator::CreateLocalGenerator()
{
! cmLocalVisualStudio10Generator* lg = new cmLocalVisualStudio10Generator;
! lg->SetPlatformName(this->PlatformName.c_str());
lg->SetGlobalGenerator(this);
return lg;
Index: cmGlobalVisualStudio8Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio8Generator.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C 2 -d -r1.19 -r1.20
*** cmGlobalVisualStudio8Generator.h 20 Oct 2009 20:38:37 -0000 1.19
--- cmGlobalVisualStudio8Generator.h 22 Oct 2009 12:24:06 -0000 1.20
***************
*** 39,42 ****
--- 39,44 ----
virtual cmLocalGenerator *CreateLocalGenerator();
+ std::string const& GetPlatformName() const { return this->PlatformName; }
+
/**
* Override Configure and Generate to add the build-system check
Index: cmVisualStudio10TargetGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmVisualStudio10TargetGenerator.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** cmVisualStudio10TargetGenerator.h 28 Sep 2009 15:42:49 -0000 1.8
--- cmVisualStudio10TargetGenerator.h 22 Oct 2009 12:24:11 -0000 1.9
***************
*** 17,21 ****
class cmMakefile;
class cmGeneratedFileStream;
! class cmGlobalVisualStudio7Generator;
class cmSourceFile;
class cmCustomCommand;
--- 17,21 ----
class cmMakefile;
class cmGeneratedFileStream;
! class cmGlobalVisualStudio10Generator;
class cmSourceFile;
class cmCustomCommand;
***************
*** 28,32 ****
public:
cmVisualStudio10TargetGenerator(cmTarget* target,
! cmGlobalVisualStudio7Generator* gg);
~cmVisualStudio10TargetGenerator();
void Generate();
--- 28,32 ----
public:
cmVisualStudio10TargetGenerator(cmTarget* target,
! cmGlobalVisualStudio10Generator* gg);
~cmVisualStudio10TargetGenerator();
void Generate();
***************
*** 83,87 ****
std::string GUID;
std::string Name;
! cmGlobalVisualStudio7Generator* GlobalGenerator;
cmGeneratedFileStream* BuildFileStream;
cmLocalVisualStudio7Generator* LocalGenerator;
--- 83,87 ----
std::string GUID;
std::string Name;
! cmGlobalVisualStudio10Generator* GlobalGenerator;
cmGeneratedFileStream* BuildFileStream;
cmLocalVisualStudio7Generator* LocalGenerator;
Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.435
retrieving revision 1.436
diff -C 2 -d -r1.435 -r1.436
*** cmake.cxx 21 Oct 2009 17:12:21 -0000 1.435
--- cmake.cxx 22 Oct 2009 12:24:11 -0000 1.436
***************
*** 64,67 ****
--- 64,68 ----
# include "cmGlobalVisualStudio9Win64Generator.h"
# include "cmGlobalVisualStudio10Generator.h"
+ # include "cmGlobalVisualStudio10Win64Generator.h"
# include "cmGlobalVisualStudio8Win64Generator.h"
# include "cmGlobalBorlandMakefileGenerator.h"
***************
*** 2365,2368 ****
--- 2366,2371 ----
this->Generators[cmGlobalVisualStudio10Generator::GetActualName()] =
&cmGlobalVisualStudio10Generator::New;
+ this->Generators[cmGlobalVisualStudio10Win64Generator::GetActualName()] =
+ &cmGlobalVisualStudio10Win64Generator::New;
this->Generators[cmGlobalVisualStudio71Generator::GetActualName()] =
&cmGlobalVisualStudio71Generator::New;
--- NEW FILE: cmGlobalVisualStudio10Win64Generator.cxx ---
/*============================================================================
CMake - Cross Platform Makefile Generator
Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
Distributed under the OSI-approved BSD License (the "License");
see accompanying file Copyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
#include "cmGlobalVisualStudio10Win64Generator.h"
#include "cmMakefile.h"
#include "cmake.h"
//----------------------------------------------------------------------------
cmGlobalVisualStudio10Win64Generator::cmGlobalVisualStudio10Win64Generator()
{
this->PlatformName = "x64";
}
//----------------------------------------------------------------------------
void cmGlobalVisualStudio10Win64Generator
::GetDocumentation(cmDocumentationEntry& entry) const
{
entry.Name = this->GetName();
entry.Brief = "Generates Visual Studio 10 Win64 project files.";
entry.Full = "";
}
//----------------------------------------------------------------------------
void cmGlobalVisualStudio10Win64Generator::EnableLanguage(
std::vector<std::string> const& lang, cmMakefile *mf, bool optional)
{
mf->AddDefinition("CMAKE_FORCE_WIN64", "TRUE");
cmGlobalVisualStudio10Generator::EnableLanguage(lang, mf, optional);
}
Index: cmVisualStudio10TargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmVisualStudio10TargetGenerator.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -C 2 -d -r1.21 -r1.22
*** cmVisualStudio10TargetGenerator.cxx 22 Oct 2009 01:30:41 -0000 1.21
--- cmVisualStudio10TargetGenerator.cxx 22 Oct 2009 12:24:11 -0000 1.22
***************
*** 11,15 ****
============================================================================*/
#include "cmVisualStudio10TargetGenerator.h"
! #include "cmGlobalVisualStudio7Generator.h"
#include "cmTarget.h"
#include "cmComputeLinkInformation.h"
--- 11,15 ----
============================================================================*/
#include "cmVisualStudio10TargetGenerator.h"
! #include "cmGlobalVisualStudio10Generator.h"
#include "cmTarget.h"
#include "cmComputeLinkInformation.h"
***************
*** 33,37 ****
cmVisualStudio10TargetGenerator::
cmVisualStudio10TargetGenerator(cmTarget* target,
! cmGlobalVisualStudio7Generator* gg)
{
this->GlobalGenerator = gg;
--- 33,37 ----
cmVisualStudio10TargetGenerator::
cmVisualStudio10TargetGenerator(cmTarget* target,
! cmGlobalVisualStudio10Generator* gg)
{
this->GlobalGenerator = gg;
***************
*** 44,48 ****
this->GlobalGenerator->CreateGUID(this->Name.c_str());
this->GUID = this->GlobalGenerator->GetGUID(this->Name.c_str());
! this->Platform = "|Win32";
this->ComputeObjectNames();
this->BuildFileStream = 0;
--- 44,48 ----
this->GlobalGenerator->CreateGUID(this->Name.c_str());
this->GUID = this->GlobalGenerator->GetGUID(this->Name.c_str());
! this->Platform = gg->GetPlatformName();
this->ComputeObjectNames();
this->BuildFileStream = 0;
***************
*** 81,85 ****
(*stream ) << "<" << tag
<< " Condition=\"'$(Configuration)|$(Platform)'=='";
! (*stream ) << config << this->Platform << "'\"";
if(attribute)
{
--- 81,85 ----
(*stream ) << "<" << tag
<< " Condition=\"'$(Configuration)|$(Platform)'=='";
! (*stream ) << config << "|" << this->Platform << "'\"";
if(attribute)
{
***************
*** 142,145 ****
--- 142,147 ----
this->WriteString("<SccLocalPath />\n", 2);
this->WriteString("<Keyword>Win32Proj</Keyword>\n", 2);
+ this->WriteString("<Platform>", 2);
+ (*this->BuildFileStream) << this->Platform << "</Platform>\n";
this->WriteString("</PropertyGroup>\n", 1);
this->WriteString("<Import Project="
***************
*** 188,195 ****
{
this->WriteString("<ProjectConfiguration Include=\"", 2);
! (*this->BuildFileStream ) << *i << this->Platform << "\">\n";
this->WriteString("<Configuration>", 3);
(*this->BuildFileStream ) << *i << "</Configuration>\n";
! this->WriteString("<Platform>Win32</Platform>\n", 3);
this->WriteString("</ProjectConfiguration>\n", 2);
}
--- 190,198 ----
{
this->WriteString("<ProjectConfiguration Include=\"", 2);
! (*this->BuildFileStream ) << *i << "|" << this->Platform << "\">\n";
this->WriteString("<Configuration>", 3);
(*this->BuildFileStream ) << *i << "</Configuration>\n";
! this->WriteString("<Platform>", 3);
! (*this->BuildFileStream) << this->Platform << "</Platform>\n";
this->WriteString("</ProjectConfiguration>\n", 2);
}
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CMakeLists.txt,v
retrieving revision 1.429
retrieving revision 1.430
diff -C 2 -d -r1.429 -r1.430
*** CMakeLists.txt 28 Sep 2009 15:41:53 -0000 1.429
--- CMakeLists.txt 22 Oct 2009 12:23:54 -0000 1.430
***************
*** 304,307 ****
--- 304,309 ----
cmGlobalVisualStudio10Generator.h
cmGlobalVisualStudio10Generator.cxx
+ cmGlobalVisualStudio10Win64Generator.h
+ cmGlobalVisualStudio10Win64Generator.cxx
cmGlobalVisualStudioGenerator.cxx
cmGlobalVisualStudioGenerator.h
--- NEW FILE: cmGlobalVisualStudio10Win64Generator.h ---
/*============================================================================
CMake - Cross Platform Makefile Generator
Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
Distributed under the OSI-approved BSD License (the "License");
see accompanying file Copyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
#ifndef cmGlobalVisualStudio10Win64Generator_h
#define cmGlobalVisualStudio10Win64Generator_h
#include "cmGlobalVisualStudio10Generator.h"
class cmGlobalVisualStudio10Win64Generator :
public cmGlobalVisualStudio10Generator
{
public:
cmGlobalVisualStudio10Win64Generator();
static cmGlobalGenerator* New() {
return new cmGlobalVisualStudio10Win64Generator; }
///! Get the name for the generator.
virtual const char* GetName() const {
return cmGlobalVisualStudio10Win64Generator::GetActualName();}
static const char* GetActualName() {return "Visual Studio 10 Win64";}
/** Get the documentation entry for this generator. */
virtual void GetDocumentation(cmDocumentationEntry& entry) const;
virtual void EnableLanguage(std::vector<std::string>const& languages,
cmMakefile *, bool optional);
};
#endif
Index: cmLocalVisualStudio10Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio10Generator.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** cmLocalVisualStudio10Generator.cxx 28 Sep 2009 15:42:47 -0000 1.6
--- cmLocalVisualStudio10Generator.cxx 22 Oct 2009 12:24:09 -0000 1.7
***************
*** 14,18 ****
#include "cmMakefile.h"
#include "cmVisualStudio10TargetGenerator.h"
! #include "cmGlobalVisualStudio7Generator.h"
#include <cm_expat.h>
#include "cmXMLParser.h"
--- 14,18 ----
#include "cmMakefile.h"
#include "cmVisualStudio10TargetGenerator.h"
! #include "cmGlobalVisualStudio10Generator.h"
#include <cm_expat.h>
#include "cmXMLParser.h"
***************
*** 94,100 ****
for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
{
! cmVisualStudio10TargetGenerator tg(&l->second,
! (cmGlobalVisualStudio7Generator*)
! this->GetGlobalGenerator());
tg.Generate();
}
--- 94,100 ----
for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
{
! cmVisualStudio10TargetGenerator tg(
! &l->second, static_cast<cmGlobalVisualStudio10Generator*>(
! this->GetGlobalGenerator()));
tg.Generate();
}
More information about the Cmake-commits
mailing list