[Cmake-commits] CMake branch, next, updated. v2.8.2-977-g23e37db

[Ben Boeckel]

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  23e37dbabadbebc2bee6cad3365a31d472bb638a (commit)
       via  96a335fd8d43b1fd73de12d29c192a29eaf5231a (commit)
      from  d3d1532b03c4cb2d7a6be83dcdd7c4f65bd09f14 (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=23e37dbabadbebc2bee6cad3365a31d472bb638a
commit 23e37dbabadbebc2bee6cad3365a31d472bb638a
Merge: d3d1532 96a335f
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Sep 30 15:09:02 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 30 15:09:02 2010 -0400

    Merge topic 'dev/test-for-bug-11230' into next
    
    96a335f XCode generation should fail if lang isn't known


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96a335fd8d43b1fd73de12d29c192a29eaf5231a
commit 96a335fd8d43b1fd73de12d29c192a29eaf5231a
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Sep 30 14:54:20 2010 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Sep 30 14:54:20 2010 -0400

    XCode generation should fail if lang isn't known

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index f989a5c..0976a4d 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1424,6 +1424,9 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
   std::string defFlags;
   bool shared = ((target.GetType() == cmTarget::SHARED_LIBRARY) ||
                  (target.GetType() == cmTarget::MODULE_LIBRARY));
+  bool binary = ((target.GetType() == cmTarget::STATIC_LIBRARY) ||
+                 (target.GetType() == cmTarget::EXECUTABLE) ||
+                 shared);
 
   const char* lang = target.GetLinkerLanguage(configName);
   std::string cflags;
@@ -1442,6 +1445,13 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     // Add shared-library flags if needed.
     this->CurrentLocalGenerator->AddSharedFlags(flags, lang, shared);
     }
+  else if(binary)
+  {
+    cmSystemTools::Error
+      ("CMake can not determine linker language for target:",
+       target.GetName());
+    return;
+  }
 
   // Add define flags
   this->CurrentLocalGenerator->

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake