[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5207-g62cd78f

[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  62cd78fe1dfd73439b1e436364d3b637606bafc7 (commit)
       via  264725c0d7cf56504c13a7e1f2dcd2f126da5140 (commit)
       via  a468f46992a929fae80689dc116f4058681d4579 (commit)
       via  7e0f3f2f172ea1a80d9fc020f63a972173dd0490 (commit)
      from  6d12531a7f83747067a66231d8afa44144d3a5fa (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=62cd78fe1dfd73439b1e436364d3b637606bafc7
commit 62cd78fe1dfd73439b1e436364d3b637606bafc7
Merge: 6d12531 264725c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 17 11:39:48 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Nov 17 11:39:48 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    264725c Fix path quoting.
    a468f46 Remove unused.
    7e0f3f2 Test installation to stage.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=264725c0d7cf56504c13a7e1f2dcd2f126da5140
commit 264725c0d7cf56504c13a7e1f2dcd2f126da5140
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 17 17:30:41 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Nov 17 17:38:27 2013 +0100

    Fix path quoting.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 8953266..cf5798f 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1110,13 +1110,13 @@ cmLocalGenerator::ExpandRuleVariable(std::string const& variable,
             {
             ret += " ";
             ret += compilerOptionExternalToolchain;
-            ret += compilerExternalToolchain;
+            ret += this->EscapeForShell(compilerExternalToolchain, true);
             }
           if (compilerSysroot && compilerOptionSysroot)
             {
             ret += " ";
             ret += compilerOptionSysroot;
-            ret += compilerSysroot;
+            ret += this->EscapeForShell(compilerSysroot, true);
             }
           return ret;
           }
diff --git a/Tests/ToolchainSettings/Consumer/CMakeLists.txt b/Tests/ToolchainSettings/Consumer/CMakeLists.txt
index 86bff1c..139e14b 100644
--- a/Tests/ToolchainSettings/Consumer/CMakeLists.txt
+++ b/Tests/ToolchainSettings/Consumer/CMakeLists.txt
@@ -13,7 +13,7 @@ foreach(_lang C CXX)
 endforeach()
 
 find_package(ZLIB REQUIRED)
-set(CMAKE_CXX_LINK_FLAGS "-L${CMAKE_SYSROOT}/usr/lib/${triple}")
+set(CMAKE_CXX_LINK_FLAGS "-L\"${CMAKE_SYSROOT}/usr/lib/${triple}\"")
 
 add_executable(executable main.cpp)
 target_link_libraries(executable ${ZLIB_LIBRARIES})

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

    Remove unused.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b736307..8953266 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -370,8 +370,6 @@ void cmLocalGenerator::GenerateInstallRules()
     prefix = "/usr/local";
     }
 #endif
-  std::string sysrootted
-                  = this->Makefile->GetSafeDefinition("CMAKE_SYSROOT");
   if (const char *stagingPrefix
                   = this->Makefile->GetDefinition("CMAKE_STAGING_PREFIX"))
     {

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

    Test installation to stage.

diff --git a/Tests/ToolchainSettings/CMakeLists.txt b/Tests/ToolchainSettings/CMakeLists.txt
index 2f6bee1..3f8f8df 100644
--- a/Tests/ToolchainSettings/CMakeLists.txt
+++ b/Tests/ToolchainSettings/CMakeLists.txt
@@ -89,7 +89,7 @@ add_custom_command(
    --build-generator-toolset "${CMAKE_GENERATOR_TOOLSET}"
    --build-makeprogram "${CMAKE_BINARY_DIR}/MakeConsumer.sh"
    --build-options
-      -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/Prefix1
+      -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/InstallationPrefix
       -DCMAKE_TOOLCHAIN_FILE=${CMAKE_BINARY_DIR}/${CMAKE_CXX_COMPILER_ID}-Toolchain.cmake
       -Dtriple=${triple}
       -DCMAKE_VERBOSE_MAKEFILE=1
diff --git a/Tests/ToolchainSettings/main.cpp b/Tests/ToolchainSettings/main.cpp
index 6afcdae..0d3a6df 100644
--- a/Tests/ToolchainSettings/main.cpp
+++ b/Tests/ToolchainSettings/main.cpp
@@ -15,6 +15,7 @@ int main(void)
 
   bool gotCompilation = false;
   bool gotLink = false;
+  bool gotInstallation = false;
   while (!f.eof())
     {
     std::string output;
@@ -50,8 +51,20 @@ int main(void)
           }
         }
       }
+    else if (output.find("-- Installing: ") != std::string::npos)
+      {
+      gotInstallation = true;
+      if (output.find("/stage/") == std::string::npos)
+        {
+        return -1;
+        }
+      if (output.find("InstallationPrefix") != std::string::npos)
+        {
+        return -1;
+        }
+      }
     }
-  if (!gotCompilation || !gotLink)
+  if (!gotCompilation || !gotLink || !gotInstallation)
     {
     return -1;
     }

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

Summary of changes:
 Source/cmLocalGenerator.cxx                     |    6 ++----
 Tests/ToolchainSettings/CMakeLists.txt          |    2 +-
 Tests/ToolchainSettings/Consumer/CMakeLists.txt |    2 +-
 Tests/ToolchainSettings/main.cpp                |   15 ++++++++++++++-
 4 files changed, 18 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake