[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2246-gaaa9ccf

[Stephen Kelly]

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  aaa9ccf325b386d8b500c0b95a2cac1409375d51 (commit)
       via  6b987f9066b8d42c611769da596d5c4ba831d96f (commit)
      from  3129fe173ed5c15465a8f5e7ff989500a4c5caee (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=aaa9ccf325b386d8b500c0b95a2cac1409375d51
commit aaa9ccf325b386d8b500c0b95a2cac1409375d51
Merge: 3129fe1 6b987f9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 20 09:12:57 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 20 09:12:57 2013 -0500

    Merge topic 'try_compile-targets' into next
    
    6b987f9 Ensure that old-style defining the LINK_LIBRARIES in try_compile works.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b987f9066b8d42c611769da596d5c4ba831d96f
commit 6b987f9066b8d42c611769da596d5c4ba831d96f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Feb 20 15:10:21 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Feb 20 15:10:56 2013 +0100

    Ensure that old-style defining the LINK_LIBRARIES in try_compile works.

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index beb4963..387f6ed 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -92,6 +92,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
 
   std::vector<cmTarget*> targets;
   std::string libsToLink = " ";
+  bool useOldLinkLibs = true;
   for (i = 3; i < argv.size(); ++i)
     {
     if (argv[i] == "LINK_LIBRARIES")
@@ -104,6 +105,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
         }
       extraArgs++;
       ++i;
+      useOldLinkLibs = false;
       for ( ; i < argv.size() && argv[i] != "CMAKE_FLAGS"
           && argv[i] != "COMPILE_DEFINITIONS" && argv[i] != "OUTPUT_VARIABLE";
           ++i)
@@ -375,7 +377,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
             this->BinaryDirectory.c_str());
     /* Create the actual executable.  */
     fprintf(fout, "ADD_EXECUTABLE(%s \"%s\")\n", targetName, source.c_str());
-    if (libsToLink.empty())
+    if (useOldLinkLibs)
       {
       fprintf(fout,
               "TARGET_LINK_LIBRARIES(%s ${LINK_LIBRARIES})\n",targetName);

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

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


hooks/post-receive
-- 
CMake