[Cmake-commits] CMake branch, next, updated. v2.8.3-1073-g134ca18

Alexander Neundorf neundorf at kde.org
Tue Dec 21 16:03:55 EST 2010


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  134ca189ad6aa8cec732afc00687b05d15b3c94d (commit)
       via  d18c8d6ad7a9111f4fec515ae58096da744f3d61 (commit)
      from  fc4072ab581b99381b9bf8328b0a6145a10545fc (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=134ca189ad6aa8cec732afc00687b05d15b3c94d
commit 134ca189ad6aa8cec732afc00687b05d15b3c94d
Merge: fc4072a d18c8d6
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Tue Dec 21 16:03:44 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 21 16:03:44 2010 -0500

    Merge topic 'FixCrashInEclipseGenerator' into next
    
    d18c8d6 Fix crash in Eclipse generator with empty project (#11616)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d18c8d6ad7a9111f4fec515ae58096da744f3d61
commit d18c8d6ad7a9111f4fec515ae58096da744f3d61
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Dec 21 21:59:39 2010 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Dec 21 21:59:39 2010 +0100

    Fix crash in Eclipse generator with empty project (#11616)
    
    If there was no language at all enabled, CMAKE_BUILD_TYPE was empty,
    which was not expected, and made the generator crash.
    
    Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 502fefa..0ef771f 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -201,7 +201,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
     "<projectDescription>\n"
     "\t<name>" <<
     this->GenerateProjectName(mf->GetProjectName(),
-                              mf->GetDefinition("CMAKE_BUILD_TYPE"),
+                              mf->GetSafeDefinition("CMAKE_BUILD_TYPE"),
                               this->GetPathBasename(this->HomeOutputDirectory))
     << "</name>\n"
     "\t<comment></comment>\n"

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list