[Cmake-commits] CMake branch, next, updated. v3.7.0-1457-gb98f80e

Brad King brad.king at kitware.com
Wed Nov 30 13:35:15 EST 2016


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  b98f80e22e4625e339121eea3cf766346bd7c96f (commit)
       via  571721c562786ee0996367b590693f82a643fbfb (commit)
      from  39ee174ab11263a519a86a17e423d3bb927d8dfd (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=b98f80e22e4625e339121eea3cf766346bd7c96f
commit b98f80e22e4625e339121eea3cf766346bd7c96f
Merge: 39ee174 571721c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 30 13:35:14 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 30 13:35:14 2016 -0500

    Merge topic 'pgi-macos-flags' into next
    
    571721c5 PGI: Pass macOS-specific link flags directly to linker


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=571721c562786ee0996367b590693f82a643fbfb
commit 571721c562786ee0996367b590693f82a643fbfb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 28 12:54:45 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 30 13:34:50 2016 -0500

    PGI: Pass macOS-specific link flags directly to linker
    
    The PGI compiler on macOS does not support some macOS-specific flags so
    pass them through `-Wl,` to the linker directly.
    
    Issue: #16457

diff --git a/Modules/Platform/Darwin-PGI-C.cmake b/Modules/Platform/Darwin-PGI-C.cmake
new file mode 100644
index 0000000..790919b
--- /dev/null
+++ b/Modules/Platform/Darwin-PGI-C.cmake
@@ -0,0 +1,2 @@
+include(Platform/Darwin-PGI)
+__darwin_compiler_pgi(C)
diff --git a/Modules/Platform/Darwin-PGI-CXX.cmake b/Modules/Platform/Darwin-PGI-CXX.cmake
new file mode 100644
index 0000000..ceaed71
--- /dev/null
+++ b/Modules/Platform/Darwin-PGI-CXX.cmake
@@ -0,0 +1,2 @@
+include(Platform/Darwin-PGI)
+__darwin_compiler_pgi(CXX)
diff --git a/Modules/Platform/Darwin-PGI-Fortran.cmake b/Modules/Platform/Darwin-PGI-Fortran.cmake
new file mode 100644
index 0000000..146807b
--- /dev/null
+++ b/Modules/Platform/Darwin-PGI-Fortran.cmake
@@ -0,0 +1,2 @@
+include(Platform/Darwin-PGI)
+__darwin_compiler_pgi(Fortran)
diff --git a/Modules/Platform/Darwin-PGI.cmake b/Modules/Platform/Darwin-PGI.cmake
new file mode 100644
index 0000000..04479a8
--- /dev/null
+++ b/Modules/Platform/Darwin-PGI.cmake
@@ -0,0 +1,14 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+# This module is shared by multiple languages; use include blocker.
+if(__DARWIN_COMPILER_PGI)
+  return()
+endif()
+set(__DARWIN_COMPILER_PGI 1)
+
+macro(__darwin_compiler_pgi lang)
+  set(CMAKE_${lang}_OSX_COMPATIBILITY_VERSION_FLAG "-Wl,-compatibility_version,")
+  set(CMAKE_${lang}_OSX_CURRENT_VERSION_FLAG "-Wl,-current_version,")
+  set(CMAKE_SHARED_LIBRARY_SONAME_${lang}_FLAG "-Wl,-install_name")
+endmacro()

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

Summary of changes:
 Modules/Platform/Darwin-PGI-C.cmake       |    2 ++
 Modules/Platform/Darwin-PGI-CXX.cmake     |    2 ++
 Modules/Platform/Darwin-PGI-Fortran.cmake |    2 ++
 Modules/Platform/Darwin-PGI.cmake         |   14 ++++++++++++++
 4 files changed, 20 insertions(+)
 create mode 100644 Modules/Platform/Darwin-PGI-C.cmake
 create mode 100644 Modules/Platform/Darwin-PGI-CXX.cmake
 create mode 100644 Modules/Platform/Darwin-PGI-Fortran.cmake
 create mode 100644 Modules/Platform/Darwin-PGI.cmake


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list