[Cmake-commits] CMake branch, next, updated. v3.6.2-1993-gd3a223e

[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  d3a223e4918e3c7eeba9ec2511309399f987cf7a (commit)
       via  7845d2aaf7e4f2080892107a4d2e73d6a966ba6f (commit)
       via  6a9ed3d4aeee576dd87af77fe51a781c5fe64b79 (commit)
      from  b129f20547e849650e9aee1b3b2b0a6835c748e2 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3a223e4918e3c7eeba9ec2511309399f987cf7a
commit d3a223e4918e3c7eeba9ec2511309399f987cf7a
Merge: b129f20 7845d2a
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Sep 13 15:09:05 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 13 15:09:05 2016 -0400

    Merge topic 'detect-relink-incompat' into next
    
    7845d2aa ninja: error out on relink requirements
    6a9ed3d4 cmGeneratorTarget: factor out a space


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7845d2aaf7e4f2080892107a4d2e73d6a966ba6f
commit 7845d2aaf7e4f2080892107a4d2e73d6a966ba6f
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Sep 13 11:23:19 2016 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Sep 13 13:53:26 2016 -0400

    ninja: error out on relink requirements
    
    Ninja does not support PRE_INSTALL_SCRIPT properties and does not
    perform the relink required by installation without help from some other
    mechanism, so error out if it would be required.
    
    See #16304.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 4f8c036..32dd150 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1162,7 +1162,23 @@ bool cmGeneratorTarget::NeedRelinkBeforeInstall(
   // If either a build or install tree rpath is set then the rpath
   // will likely change between the build tree and install tree and
   // this target must be relinked.
-  return this->HaveBuildTreeRPATH(config) || this->HaveInstallTreeRPATH();
+  bool have_rpath =
+    this->HaveBuildTreeRPATH(config) || this->HaveInstallTreeRPATH();
+  bool is_ninja =
+    this->LocalGenerator->GetGlobalGenerator()->GetName() == "Ninja";
+
+  if (have_rpath && is_ninja) {
+    std::ostringstream w;
+    w << "Ninja does not support relinking before installation "
+         "on non-ELF platforms. This has been detected as a \""
+      << this->Makefile->GetDefinition("CMAKE_EXECUTABLE_FORMAT")
+      << "\" platform.";
+
+    cmake* cm = this->LocalGenerator->GetCMakeInstance();
+    cm->IssueMessage(cmake::FATAL_ERROR, w.str(), this->GetBacktrace());
+  }
+
+  return have_rpath;
 }
 
 bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a9ed3d4aeee576dd87af77fe51a781c5fe64b79
commit 6a9ed3d4aeee576dd87af77fe51a781c5fe64b79
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Sep 13 11:22:42 2016 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Sep 13 11:22:42 2016 -0400

    cmGeneratorTarget: factor out a space

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 7dd8e7f..4f8c036 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1280,11 +1280,11 @@ bool cmGeneratorTarget::HasMacOSXRpathInstallNameDir(
 
   if (!this->Makefile->IsSet("CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG")) {
     std::ostringstream w;
-    w << "Attempting to use";
+    w << "Attempting to use ";
     if (macosx_rpath) {
-      w << " MACOSX_RPATH";
+      w << "MACOSX_RPATH";
     } else {
-      w << " @rpath";
+      w << "@rpath";
     }
     w << " without CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG being set.";
     w << "  This could be because you are using a Mac OS X version";

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

Summary of changes:
 Source/cmGeneratorTarget.cxx |   24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake