[Cmake-commits] CMake branch, next, updated. v2.8.3-884-ga9808ee

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a9808eeba7a31ebe404f92c7a4add539155036cd (commit)
       via  2afb820352845513d46af1464cb1161e335eb435 (commit)
      from  d555dd3854f7b59f1c335a05f1920908ee3f1fcd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9808eeba7a31ebe404f92c7a4add539155036cd
commit a9808eeba7a31ebe404f92c7a4add539155036cd
Merge: d555dd3 2afb820
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 14 16:38:26 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 14 16:38:26 2010 -0500

    Merge topic 'try-compile-min-version' into next
    
    2afb820 Write full version into try_compile CMakeLists


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2afb820352845513d46af1464cb1161e335eb435
commit 2afb820352845513d46af1464cb1161e335eb435
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 14 09:36:06 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 14 16:36:55 2010 -0500

    Write full version into try_compile CMakeLists
    
    Pass the full version to cmake_minimum_required(VERSION) in generated
    CMake files for try_compile projects.  This tells CMake not to use any
    backward compatibility behavior while processing code it generates.

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index b8a0c95..a1c707d 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -169,8 +169,9 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
     const char* lang =(this->Makefile->GetCMakeInstance()->GetGlobalGenerator()
                         ->GetLanguageFromExtension(ext.c_str()));
     const char* def = this->Makefile->GetDefinition("CMAKE_MODULE_PATH");
-    fprintf(fout, "cmake_minimum_required(VERSION %u.%u)\n",
-            cmVersion::GetMajorVersion(), cmVersion::GetMinorVersion());
+    fprintf(fout, "cmake_minimum_required(VERSION %u.%u.%u.%u)\n",
+            cmVersion::GetMajorVersion(), cmVersion::GetMinorVersion(),
+            cmVersion::GetPatchVersion(), cmVersion::GetTweakVersion());
     if(def)
       {
       fprintf(fout, "SET(CMAKE_MODULE_PATH %s)\n", def);

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCoreTryCompile.cxx |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake