[Cmake-commits] CMake branch, master, updated. v3.15.1-574-g26a3bcc

[Kitware Robot]

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, master has been updated
       via  26a3bccb60b1ba97b528187c244acf4c3bbceb3e (commit)
       via  e9ade44cb13c35994d65ef6ae125e97c5514ba9b (commit)
       via  f6d6dbc2933248dc7f17fd033e2b70fb161fddbd (commit)
       via  edca8d5c3ad34a829e0d4af36a9fd8818603d457 (commit)
      from  7eb2fd6ca68e2681a08aef8b1dd8db253b172e00 (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=26a3bccb60b1ba97b528187c244acf4c3bbceb3e
commit 26a3bccb60b1ba97b528187c244acf4c3bbceb3e
Merge: e9ade44 f6d6dbc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 5 14:31:04 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Aug 5 10:31:18 2019 -0400

    Merge topic 'link-library-file-flag'
    
    f6d6dbc293 Make CMAKE_LINK_LIBRARY_FILE_FLAG work like CMAKE_LINK_LIBRARY_FLAG
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3641


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9ade44cb13c35994d65ef6ae125e97c5514ba9b
commit e9ade44cb13c35994d65ef6ae125e97c5514ba9b
Merge: 7eb2fd6 edca8d5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 5 10:27:47 2019 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 5 10:27:47 2019 -0400

    Merge branch 'release-3.15'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6d6dbc2933248dc7f17fd033e2b70fb161fddbd
commit f6d6dbc2933248dc7f17fd033e2b70fb161fddbd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 2 11:51:55 2019 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 2 13:37:39 2019 -0400

    Make CMAKE_LINK_LIBRARY_FILE_FLAG work like CMAKE_LINK_LIBRARY_FLAG
    
    The `CMAKE_LINK_LIBRARY_FILE_FLAG` variable is meant for linkers that
    want library file paths to be preceded by a flag.  This is used only
    for OpenWatcom to add the `library` argument before library file paths.
    Refactor the approach to treat `CMAKE_LINK_LIBRARY_FILE_FLAG` as a
    command-line string fragment to add just before the library file path.
    This has two advantages:
    
    * `CMAKE_LINK_LIBRARY_FILE_FLAG` now works like `CMAKE_LINK_LIBRARY_FLAG`.
    * `CMAKE_LINK_LIBRARY_FILE_FLAG` can now be an attached flag whose value
      is the library file path.
    
    Technically this is a change in behavior, but this setting was created
    for internal use and should be rarely used outside of CMake itself.
    
    Fixes: #19541

diff --git a/Modules/Platform/Windows-OpenWatcom.cmake b/Modules/Platform/Windows-OpenWatcom.cmake
index d38d616..76cd28b 100644
--- a/Modules/Platform/Windows-OpenWatcom.cmake
+++ b/Modules/Platform/Windows-OpenWatcom.cmake
@@ -10,7 +10,7 @@ set(__WINDOWS_OPENWATCOM 1)
 
 set(CMAKE_LIBRARY_PATH_FLAG "libpath ")
 set(CMAKE_LINK_LIBRARY_FLAG "library ")
-set(CMAKE_LINK_LIBRARY_FILE_FLAG "library")
+set(CMAKE_LINK_LIBRARY_FILE_FLAG "library ")
 
 if(CMAKE_VERBOSE_MAKEFILE)
   set(CMAKE_WCL_QUIET)
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 78cddf0..5f46631 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -990,11 +990,6 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
     return;
   }
 
-  // If this platform wants a flag before the full path, add it.
-  if (!this->LibLinkFileFlag.empty()) {
-    this->Items.emplace_back(this->LibLinkFileFlag, false);
-  }
-
   // For compatibility with CMake 2.4 include the item's directory in
   // the linker search path.
   if (this->OldLinkDirMode && !target->IsFrameworkOnApple() &&
@@ -1057,11 +1052,6 @@ void cmComputeLinkInformation::AddFullItem(std::string const& item)
     this->OldLinkDirItems.push_back(item);
   }
 
-  // If this platform wants a flag before the full path, add it.
-  if (!this->LibLinkFileFlag.empty()) {
-    this->Items.emplace_back(this->LibLinkFileFlag, false);
-  }
-
   // Now add the full path to the library.
   this->Items.emplace_back(item, true);
 }
diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h
index 3be2c7f..784d3fa 100644
--- a/Source/cmComputeLinkInformation.h
+++ b/Source/cmComputeLinkInformation.h
@@ -56,6 +56,11 @@ public:
   std::string GetChrpathString() const;
   std::set<cmGeneratorTarget const*> const& GetSharedLibrariesLinked() const;
 
+  std::string const& GetLibLinkFileFlag() const
+  {
+    return this->LibLinkFileFlag;
+  }
+
   std::string const& GetRPathLinkFlag() const { return this->RPathLinkFlag; }
   std::string GetRPathLinkString() const;
 
diff --git a/Source/cmLinkLineComputer.cxx b/Source/cmLinkLineComputer.cxx
index 8746b35..4430f97 100644
--- a/Source/cmLinkLineComputer.cxx
+++ b/Source/cmLinkLineComputer.cxx
@@ -63,6 +63,7 @@ std::string cmLinkLineComputer::ComputeLinkLibs(cmComputeLinkInformation& cli)
       continue;
     }
     if (item.IsPath) {
+      linkLibs += cli.GetLibLinkFileFlag();
       linkLibs +=
         this->ConvertToOutputFormat(this->ConvertToLinkReference(item.Value));
     } else {

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

Summary of changes:
 Modules/Platform/Windows-OpenWatcom.cmake |  2 +-
 Source/cmComputeLinkInformation.cxx       | 10 ----------
 Source/cmComputeLinkInformation.h         |  5 +++++
 Source/cmLinkLineComputer.cxx             |  1 +
 4 files changed, 7 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake