[Cmake-commits] [cmake-commits] hoffman committed cmGlobalVisualStudio10Generator.cxx 1.5 1.6 cmGlobalVisualStudio10Win64Generator.cxx 1.1 1.2 cmGlobalVisualStudio10Win64Generator.h 1.1 1.2 cmGlobalVisualStudio6Generator.cxx 1.82 1.83 cmGlobalVisualStudio71Generator.cxx 1.56 1.57 cmGlobalVisualStudio7Generator.cxx 1.113 1.114 cmGlobalVisualStudio8Generator.cxx 1.42 1.43 cmGlobalVisualStudio8Win64Generator.cxx 1.6 1.7 cmGlobalVisualStudio8Win64Generator.h 1.4 1.5 cmGlobalVisualStudio9Generator.cxx 1.7 1.8 cmGlobalVisualStudio9Win64Generator.cxx 1.2 1.3 cmGlobalVisualStudio9Win64Generator.h 1.2 1.3
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Nov 20 11:55:34 EST 2009
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv19465
Modified Files:
cmGlobalVisualStudio10Generator.cxx
cmGlobalVisualStudio10Win64Generator.cxx
cmGlobalVisualStudio10Win64Generator.h
cmGlobalVisualStudio6Generator.cxx
cmGlobalVisualStudio71Generator.cxx
cmGlobalVisualStudio7Generator.cxx
cmGlobalVisualStudio8Generator.cxx
cmGlobalVisualStudio8Win64Generator.cxx
cmGlobalVisualStudio8Win64Generator.h
cmGlobalVisualStudio9Generator.cxx
cmGlobalVisualStudio9Win64Generator.cxx
cmGlobalVisualStudio9Win64Generator.h
Log Message:
Teach VS generators to set the MACHINE type correctly.
Index: cmGlobalVisualStudio9Win64Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio9Win64Generator.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** cmGlobalVisualStudio9Win64Generator.h 28 Sep 2009 15:42:41 -0000 1.2
--- cmGlobalVisualStudio9Win64Generator.h 20 Nov 2009 16:55:28 -0000 1.3
***************
*** 44,49 ****
* extension, pthreads, byte order etc.
*/
! virtual void EnableLanguage(std::vector<std::string>const& languages,
! cmMakefile *, bool optional);
};
#endif
--- 44,48 ----
* extension, pthreads, byte order etc.
*/
! virtual void AddPlatformDefinitions(cmMakefile *);
};
#endif
Index: cmGlobalVisualStudio10Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio10Generator.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** cmGlobalVisualStudio10Generator.cxx 22 Oct 2009 14:22:16 -0000 1.5
--- cmGlobalVisualStudio10Generator.cxx 20 Nov 2009 16:55:11 -0000 1.6
***************
*** 26,29 ****
--- 26,31 ----
{
mf->AddDefinition("MSVC10", "1");
+ mf->AddDefinition("MSVC_C_ARCHITECTURE_ID", "X86");
+ mf->AddDefinition("MSVC_CXX_ARCHITECTURE_ID", "X86");
}
Index: cmGlobalVisualStudio8Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio8Generator.cxx,v
retrieving revision 1.42
retrieving revision 1.43
diff -C 2 -d -r1.42 -r1.43
*** cmGlobalVisualStudio8Generator.cxx 20 Oct 2009 20:38:37 -0000 1.42
--- cmGlobalVisualStudio8Generator.cxx 20 Nov 2009 16:55:19 -0000 1.43
***************
*** 56,59 ****
--- 56,61 ----
void cmGlobalVisualStudio8Generator::AddPlatformDefinitions(cmMakefile* mf)
{
+ mf->AddDefinition("MSVC_C_ARCHITECTURE_ID", "X86");
+ mf->AddDefinition("MSVC_CXX_ARCHITECTURE_ID", "X86");
mf->AddDefinition("MSVC80", "1");
}
Index: cmGlobalVisualStudio71Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio71Generator.cxx,v
retrieving revision 1.56
retrieving revision 1.57
diff -C 2 -d -r1.56 -r1.57
*** cmGlobalVisualStudio71Generator.cxx 1 Oct 2009 14:26:54 -0000 1.56
--- cmGlobalVisualStudio71Generator.cxx 20 Nov 2009 16:55:15 -0000 1.57
***************
*** 37,40 ****
--- 37,41 ----
void cmGlobalVisualStudio71Generator::AddPlatformDefinitions(cmMakefile* mf)
{
+ this->cmGlobalVisualStudio7Generator::AddPlatformDefinitions(mf);
mf->AddDefinition("MSVC71", "1");
}
Index: cmGlobalVisualStudio9Win64Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio9Win64Generator.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** cmGlobalVisualStudio9Win64Generator.cxx 28 Sep 2009 15:42:41 -0000 1.2
--- cmGlobalVisualStudio9Win64Generator.cxx 20 Nov 2009 16:55:26 -0000 1.3
***************
*** 40,48 ****
}
void cmGlobalVisualStudio9Win64Generator
! ::EnableLanguage(std::vector<std::string>const & lang,
! cmMakefile *mf, bool optional)
{
mf->AddDefinition("CMAKE_FORCE_WIN64", "TRUE");
! cmGlobalVisualStudio9Generator::EnableLanguage(lang, mf, optional);
}
--- 40,50 ----
}
+ //----------------------------------------------------------------------------
void cmGlobalVisualStudio9Win64Generator
! ::AddPlatformDefinitions(cmMakefile* mf)
{
+ cmGlobalVisualStudio9Generator::AddPlatformDefinitions(mf);
mf->AddDefinition("CMAKE_FORCE_WIN64", "TRUE");
! mf->AddDefinition("MSVC_C_ARCHITECTURE_ID", "x64");
! mf->AddDefinition("MSVC_CXX_ARCHITECTURE_ID", "x64");
}
Index: cmGlobalVisualStudio8Win64Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio8Win64Generator.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** cmGlobalVisualStudio8Win64Generator.cxx 28 Sep 2009 15:42:41 -0000 1.6
--- cmGlobalVisualStudio8Win64Generator.cxx 20 Nov 2009 16:55:21 -0000 1.7
***************
*** 43,51 ****
}
void cmGlobalVisualStudio8Win64Generator
! ::EnableLanguage(std::vector<std::string>const & lang,
! cmMakefile *mf, bool optional)
{
mf->AddDefinition("CMAKE_FORCE_WIN64", "TRUE");
! cmGlobalVisualStudio8Generator::EnableLanguage(lang, mf, optional);
}
--- 43,53 ----
}
+ //----------------------------------------------------------------------------
void cmGlobalVisualStudio8Win64Generator
! ::AddPlatformDefinitions(cmMakefile* mf)
{
+ this->cmGlobalVisualStudio8Generator::AddPlatformDefinitions(mf);
mf->AddDefinition("CMAKE_FORCE_WIN64", "TRUE");
! mf->AddDefinition("MSVC_C_ARCHITECTURE_ID", "x64");
! mf->AddDefinition("MSVC_CXX_ARCHITECTURE_ID", "x64");
}
Index: cmGlobalVisualStudio8Win64Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio8Win64Generator.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** cmGlobalVisualStudio8Win64Generator.h 28 Sep 2009 15:42:41 -0000 1.4
--- cmGlobalVisualStudio8Win64Generator.h 20 Nov 2009 16:55:22 -0000 1.5
***************
*** 44,49 ****
* extension, pthreads, byte order etc.
*/
! virtual void EnableLanguage(std::vector<std::string>const& languages,
! cmMakefile *, bool optional);
};
#endif
--- 44,48 ----
* extension, pthreads, byte order etc.
*/
! virtual void AddPlatformDefinitions(cmMakefile *);
};
#endif
Index: cmGlobalVisualStudio10Win64Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio10Win64Generator.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** cmGlobalVisualStudio10Win64Generator.cxx 22 Oct 2009 12:23:57 -0000 1.1
--- cmGlobalVisualStudio10Win64Generator.cxx 20 Nov 2009 16:55:13 -0000 1.2
***************
*** 30,37 ****
//----------------------------------------------------------------------------
! void cmGlobalVisualStudio10Win64Generator::EnableLanguage(
! std::vector<std::string> const& lang, cmMakefile *mf, bool optional)
{
mf->AddDefinition("CMAKE_FORCE_WIN64", "TRUE");
! cmGlobalVisualStudio10Generator::EnableLanguage(lang, mf, optional);
}
--- 30,39 ----
//----------------------------------------------------------------------------
! void cmGlobalVisualStudio10Win64Generator
! ::AddPlatformDefinitions(cmMakefile* mf)
{
+ this->cmGlobalVisualStudio10Generator::AddPlatformDefinitions(mf);
mf->AddDefinition("CMAKE_FORCE_WIN64", "TRUE");
! mf->AddDefinition("MSVC_C_ARCHITECTURE_ID", "X86");
! mf->AddDefinition("MSVC_CXX_ARCHITECTURE_ID", "X86");
}
Index: cmGlobalVisualStudio9Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio9Generator.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** cmGlobalVisualStudio9Generator.cxx 28 Sep 2009 15:42:41 -0000 1.7
--- cmGlobalVisualStudio9Generator.cxx 20 Nov 2009 16:55:24 -0000 1.8
***************
*** 26,29 ****
--- 26,31 ----
void cmGlobalVisualStudio9Generator::AddPlatformDefinitions(cmMakefile* mf)
{
+ mf->AddDefinition("MSVC_C_ARCHITECTURE_ID", "X86");
+ mf->AddDefinition("MSVC_CXX_ARCHITECTURE_ID", "X86");
mf->AddDefinition("MSVC90", "1");
}
Index: cmGlobalVisualStudio10Win64Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio10Win64Generator.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** cmGlobalVisualStudio10Win64Generator.h 22 Oct 2009 12:24:02 -0000 1.1
--- cmGlobalVisualStudio10Win64Generator.h 20 Nov 2009 16:55:15 -0000 1.2
***************
*** 31,36 ****
virtual void GetDocumentation(cmDocumentationEntry& entry) const;
! virtual void EnableLanguage(std::vector<std::string>const& languages,
! cmMakefile *, bool optional);
};
#endif
--- 31,36 ----
virtual void GetDocumentation(cmDocumentationEntry& entry) const;
! virtual void AddPlatformDefinitions(cmMakefile* mf);
!
};
#endif
Index: cmGlobalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio6Generator.cxx,v
retrieving revision 1.82
retrieving revision 1.83
diff -C 2 -d -r1.82 -r1.83
*** cmGlobalVisualStudio6Generator.cxx 6 Oct 2009 17:30:00 -0000 1.82
--- cmGlobalVisualStudio6Generator.cxx 20 Nov 2009 16:55:15 -0000 1.83
***************
*** 45,48 ****
--- 45,50 ----
mf->AddDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV", "1");
mf->AddDefinition("CMAKE_GENERATOR_Fortran", "ifort");
+ mf->AddDefinition("MSVC_C_ARCHITECTURE_ID", "X86");
+ mf->AddDefinition("MSVC_CXX_ARCHITECTURE_ID", "X86");
mf->AddDefinition("MSVC60", "1");
this->GenerateConfigurations(mf);
Index: cmGlobalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio7Generator.cxx,v
retrieving revision 1.113
retrieving revision 1.114
diff -C 2 -d -r1.113 -r1.114
*** cmGlobalVisualStudio7Generator.cxx 19 Oct 2009 14:47:34 -0000 1.113
--- cmGlobalVisualStudio7Generator.cxx 20 Nov 2009 16:55:16 -0000 1.114
***************
*** 32,36 ****
mf->AddDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV", "1");
mf->AddDefinition("CMAKE_GENERATOR_FC", "ifort");
-
this->AddPlatformDefinitions(mf);
--- 32,35 ----
***************
*** 60,63 ****
--- 59,64 ----
{
mf->AddDefinition("MSVC70", "1");
+ mf->AddDefinition("MSVC_C_ARCHITECTURE_ID", "X86");
+ mf->AddDefinition("MSVC_CXX_ARCHITECTURE_ID", "X86");
}
More information about the Cmake-commits
mailing list