[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-68-g9c51962

[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  9c5196216d44b63f6cad64a3088c68cdd133b5a8 (commit)
       via  fcfe121fd82fcb24c9f40f052cb20d403c92edb7 (commit)
      from  53d7c926741f54e8d556ffe3f0b415625e1f5293 (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=9c5196216d44b63f6cad64a3088c68cdd133b5a8
commit 9c5196216d44b63f6cad64a3088c68cdd133b5a8
Merge: 53d7c92 fcfe121
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 6 08:58:56 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 6 08:58:56 2016 -0400

    Merge topic 'SunOS-PathScale' into next
    
    fcfe121f Platform: add flag definitions for PathScale compiler on SunOS (#16135)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcfe121fd82fcb24c9f40f052cb20d403c92edb7
commit fcfe121fd82fcb24c9f40f052cb20d403c92edb7
Author:     Michał Górny <mgorny at gentoo.org>
AuthorDate: Sun Jun 5 21:30:12 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 6 08:58:20 2016 -0400

    Platform: add flag definitions for PathScale compiler on SunOS (#16135)

diff --git a/Modules/Platform/SunOS-PathScale-C.cmake b/Modules/Platform/SunOS-PathScale-C.cmake
new file mode 100644
index 0000000..2f78da1
--- /dev/null
+++ b/Modules/Platform/SunOS-PathScale-C.cmake
@@ -0,0 +1,2 @@
+include(Platform/SunOS-PathScale)
+__sunos_compiler_pathscale(C)
diff --git a/Modules/Platform/SunOS-PathScale-CXX.cmake b/Modules/Platform/SunOS-PathScale-CXX.cmake
new file mode 100644
index 0000000..bb79d86
--- /dev/null
+++ b/Modules/Platform/SunOS-PathScale-CXX.cmake
@@ -0,0 +1,2 @@
+include(Platform/SunOS-PathScale)
+__sunos_compiler_pathscale(CXX)
diff --git a/Modules/Platform/SunOS-PathScale-Fortran.cmake b/Modules/Platform/SunOS-PathScale-Fortran.cmake
new file mode 100644
index 0000000..3c202f7
--- /dev/null
+++ b/Modules/Platform/SunOS-PathScale-Fortran.cmake
@@ -0,0 +1,2 @@
+include(Platform/SunOS-PathScale)
+__sunos_compiler_pathscale(Fortran)
diff --git a/Modules/Platform/SunOS-PathScale.cmake b/Modules/Platform/SunOS-PathScale.cmake
new file mode 100644
index 0000000..1afe56a
--- /dev/null
+++ b/Modules/Platform/SunOS-PathScale.cmake
@@ -0,0 +1,31 @@
+
+#=============================================================================
+# Copyright 2016 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+# This module is shared by multiple languages; use include blocker.
+if(__SUNOS_COMPILER_PATHSCALE)
+  return()
+endif()
+set(__SUNOS_COMPILER_PATHSCALE 1)
+
+macro(__sunos_compiler_pathscale lang)
+  # Shared library compile and link flags.
+  set(CMAKE_${lang}_COMPILE_OPTIONS_PIC "-fPIC")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIE")
+  set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-fPIC")
+  set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-shared")
+
+  set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,-R")
+  set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":")
+  set(CMAKE_SHARED_LIBRARY_SONAME_${lang}_FLAG "-Wl,-h")
+endmacro()

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

Summary of changes:
 Modules/Platform/SunOS-PathScale-C.cmake                   |    2 ++
 Modules/Platform/SunOS-PathScale-CXX.cmake                 |    2 ++
 Modules/Platform/SunOS-PathScale-Fortran.cmake             |    2 ++
 .../{Linux-PathScale.cmake => SunOS-PathScale.cmake}       |   12 ++++++++----
 4 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 Modules/Platform/SunOS-PathScale-C.cmake
 create mode 100644 Modules/Platform/SunOS-PathScale-CXX.cmake
 create mode 100644 Modules/Platform/SunOS-PathScale-Fortran.cmake
 copy Modules/Platform/{Linux-PathScale.cmake => SunOS-PathScale.cmake} (74%)


hooks/post-receive
-- 
CMake