[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5209-g8860d91

[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  8860d91851b7962ec0b995220c5920af08c0cd71 (commit)
       via  572c56a8072ff8b6b3eaf35d2768dd17422c8428 (commit)
      from  62cd78fe1dfd73439b1e436364d3b637606bafc7 (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=8860d91851b7962ec0b995220c5920af08c0cd71
commit 8860d91851b7962ec0b995220c5920af08c0cd71
Merge: 62cd78f 572c56a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 17 11:51:24 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Nov 17 11:51:24 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    572c56a Add error diagnosis.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=572c56a8072ff8b6b3eaf35d2768dd17422c8428
commit 572c56a8072ff8b6b3eaf35d2768dd17422c8428
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 17 17:50:50 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Nov 17 17:50:50 2013 +0100

    Add error diagnosis.

diff --git a/Tests/ToolchainSettings/main.cpp b/Tests/ToolchainSettings/main.cpp
index 0d3a6df..2460d23 100644
--- a/Tests/ToolchainSettings/main.cpp
+++ b/Tests/ToolchainSettings/main.cpp
@@ -24,6 +24,7 @@ int main(void)
       {
       if (output.find("-sysroot") == std::string::npos)
         {
+        std::cout << "Sysroot not used by compiler: " << output << std::endl;
         return -1;
         }
       if (output.find(" -c ") != std::string::npos)
@@ -31,10 +32,12 @@ int main(void)
         gotCompilation = true;
         if (output.find(" -I") != std::string::npos)
           {
+          std::cout << "Unexpected include: " << output << std::endl;
           return -1;
           }
         if (output.find(" -isystem") != std::string::npos)
           {
+          std::cout << "Unexpected include: " << output << std::endl;
           return -1;
           }
         }
@@ -43,10 +46,12 @@ int main(void)
         gotLink = true;
         if (output.find("zlib.so") != std::string::npos)
           {
+          std::cout << "Unexpected library name: " << output << std::endl;
           return -1;
           }
         if (output.find("-lz") == std::string::npos)
           {
+          std::cout << "Expected -lz: " << output << std::endl;
           return -1;
           }
         }
@@ -56,16 +61,29 @@ int main(void)
       gotInstallation = true;
       if (output.find("/stage/") == std::string::npos)
         {
+        std::cout << "Install outside stage: " << output << std::endl;
         return -1;
         }
       if (output.find("InstallationPrefix") != std::string::npos)
         {
+        std::cout << "Install to prefix, not stage: " << output << std::endl;
         return -1;
         }
       }
     }
-  if (!gotCompilation || !gotLink || !gotInstallation)
+  if (!gotCompilation)
     {
+    std::cout << "Compilation step missing." << std::endl;
+    return -1;
+    }
+  if (!gotLink)
+    {
+    std::cout << "Link step missing." << std::endl;
+    return -1;
+    }
+  if (!gotInstallation)
+    {
+    std::cout << "Installation step missing." << std::endl;
     return -1;
     }
   f.close();

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

Summary of changes:
 Tests/ToolchainSettings/main.cpp |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake