diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ChangeLog.manual | 2 | ||||
| -rw-r--r-- | Modules/Platform/Windows-cl.cmake | 4 | ||||
| -rw-r--r-- | Modules/Platform/Windows-cl.cmake.in | 1 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio9Generator.cxx | 5 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio9Generator.h | 1 |
6 files changed, 14 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 254b8a2..3dc7b2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ SET(CMake_VERSION_MAJOR 2) SET(CMake_VERSION_MINOR 4) SET(CMake_VERSION_PATCH 8) # for an actual release this should not be defined -SET(CMake_VERSION_RC 13) +#SET(CMake_VERSION_RC 13) SET(CMake_VERSION "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}") SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}") diff --git a/ChangeLog.manual b/ChangeLog.manual index cf4a087..2105093 100644 --- a/ChangeLog.manual +++ b/ChangeLog.manual @@ -1,3 +1,5 @@ +Changes in CMake 2.4.8 +* MSVC90 now defined for vs 9 Changes in CMake 2.4.8 RC 13 * fix vs 9 so it works, again... * fix bug 6150, working directory can now change drives with vs custom commands diff --git a/Modules/Platform/Windows-cl.cmake b/Modules/Platform/Windows-cl.cmake index 86afe68..8048a4a 100644 --- a/Modules/Platform/Windows-cl.cmake +++ b/Modules/Platform/Windows-cl.cmake @@ -136,6 +136,10 @@ IF(CMAKE_GENERATOR MATCHES "Makefiles") SET(MSVC80 1) SET(CMAKE_COMPILER_2005 1) ENDIF("${compilerVersion}" EQUAL 1400) + IF("${compilerVersion}" EQUAL 1500) + SET(MSVC90 1) + SET(MSVC80 0) + ENDIF("${compilerVersion}" EQUAL 1500) IF("${compilerVersion}" GREATER 1400) SET(MSVC80 1) SET(CMAKE_COMPILER_2005 1) diff --git a/Modules/Platform/Windows-cl.cmake.in b/Modules/Platform/Windows-cl.cmake.in index 0ac9ed8..1a889f2 100644 --- a/Modules/Platform/Windows-cl.cmake.in +++ b/Modules/Platform/Windows-cl.cmake.in @@ -7,6 +7,7 @@ SET(MSVC60 @MSVC60@) SET(MSVC70 @MSVC70@) SET(MSVC71 @MSVC71@) SET(MSVC80 @MSVC80@) +SET(MSVC90 @MSVC90@) SET(MSVC_IDE @MSVC_IDE@) SET(MSVC_VERSION @MSVC_VERSION@) SET(WIN32 1) diff --git a/Source/cmGlobalVisualStudio9Generator.cxx b/Source/cmGlobalVisualStudio9Generator.cxx index 989c61a..ca21083 100644 --- a/Source/cmGlobalVisualStudio9Generator.cxx +++ b/Source/cmGlobalVisualStudio9Generator.cxx @@ -27,6 +27,11 @@ cmGlobalVisualStudio9Generator::cmGlobalVisualStudio9Generator() this->FindMakeProgramFile = "CMakeVS9FindMake.cmake"; } +//---------------------------------------------------------------------------- +void cmGlobalVisualStudio9Generator::AddPlatformDefinitions(cmMakefile* mf) +{ + mf->AddDefinition("MSVC90", "1"); +} void cmGlobalVisualStudio9Generator::WriteSLNHeader(std::ostream& fout) { diff --git a/Source/cmGlobalVisualStudio9Generator.h b/Source/cmGlobalVisualStudio9Generator.h index 4deceb0..6b79fc0 100644 --- a/Source/cmGlobalVisualStudio9Generator.h +++ b/Source/cmGlobalVisualStudio9Generator.h @@ -37,6 +37,7 @@ public: virtual const char* GetName() const { return cmGlobalVisualStudio9Generator::GetActualName();} static const char* GetActualName() {return "Visual Studio 9 2008";} + virtual void AddPlatformDefinitions(cmMakefile* mf); /** Get the documentation entry for this generator. */ virtual void GetDocumentation(cmDocumentationEntry& entry) const; |