[Cmake-commits] CMake branch, next, updated. v3.6.2-2011-g9e722dc

[Brad King]

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  9e722dc6a52b9c2e1c4960ace4e20a349eebcdcc (commit)
       via  43eff66eec36e506acc34de58528b9885b647222 (commit)
      from  911af875017d698f057d8cdcd5d26b8186b6631a (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=9e722dc6a52b9c2e1c4960ace4e20a349eebcdcc
commit 9e722dc6a52b9c2e1c4960ace4e20a349eebcdcc
Merge: 911af87 43eff66
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 14 09:02:00 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 14 09:02:00 2016 -0400

    Merge topic 'detect-relink-incompat' into next
    
    43eff66e Revert "ninja: error out on relink requirements"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43eff66eec36e506acc34de58528b9885b647222
commit 43eff66eec36e506acc34de58528b9885b647222
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 14 09:01:35 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 14 09:01:35 2016 -0400

    Revert "ninja: error out on relink requirements"
    
    This reverts commit 7845d2aaf7e4f2080892107a4d2e73d6a966ba6f.
    It will be revised and restored.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 32dd150..4f8c036 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1162,23 +1162,7 @@ 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.
-  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;
+  return this->HaveBuildTreeRPATH(config) || this->HaveInstallTreeRPATH();
 }
 
 bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const

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

Summary of changes:
 Source/cmGeneratorTarget.cxx |   18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)


hooks/post-receive
-- 
CMake