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 dbd960a80fcc80a9f0dd1c16c7c16711af4d0b46 (commit)
via 3e55efe28a5bdca48951589f34ff191e696f3782 (commit)
from ffc7b31943346ec70de4537873d20ea98b76326c (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=dbd960a80fcc80a9f0dd1c16c7c16711af4d0b46
commit dbd960a80fcc80a9f0dd1c16c7c16711af4d0b46
Merge: ffc7b31 3e55efe
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Sep 30 15:02:09 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Sep 30 15:02:09 2015 -0400
Merge topic 'cray-linux-compiler-wrappers' into next
3e55efe2 Revise topic 'cray-linux-compiler-wrappers'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e55efe28a5bdca48951589f34ff191e696f3782
commit 3e55efe28a5bdca48951589f34ff191e696f3782
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Sep 30 14:57:44 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Sep 30 14:57:44 2015 -0400
Revise topic 'cray-linux-compiler-wrappers'
diff --git a/Modules/CMakeCInformation.cmake b/Modules/CMakeCInformation.cmake
index d2417aa..0d102a1 100644
--- a/Modules/CMakeCInformation.cmake
+++ b/Modules/CMakeCInformation.cmake
@@ -75,6 +75,10 @@ if(CMAKE_C_SIZEOF_DATA_PTR)
unset(CMAKE_C_ABI_FILES)
endif()
+if(CMAKE_C_COMPILER_LINKS_STATICALLY)
+ set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
+endif()
+
# This should be included before the _INIT variables are
# used to initialize the cache. Since the rule variables
# have if blocks on them, users can still define them here.
diff --git a/Modules/CMakeCXXInformation.cmake
b/Modules/CMakeCXXInformation.cmake
index 091627b..dad7969 100644
--- a/Modules/CMakeCXXInformation.cmake
+++ b/Modules/CMakeCXXInformation.cmake
@@ -74,6 +74,10 @@ if(CMAKE_CXX_SIZEOF_DATA_PTR)
unset(CMAKE_CXX_ABI_FILES)
endif()
+if(CMAKE_CXX_COMPILER_LINKS_STATICALLY)
+ set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
+endif()
+
# This should be included before the _INIT variables are
# used to initialize the cache. Since the rule variables
# have if blocks on them, users can still define them here.
diff --git a/Modules/CMakeFortranInformation.cmake
b/Modules/CMakeFortranInformation.cmake
index 79393d3..aa48df7 100644
--- a/Modules/CMakeFortranInformation.cmake
+++ b/Modules/CMakeFortranInformation.cmake
@@ -51,6 +51,10 @@ if(CMAKE_Fortran_SIZEOF_DATA_PTR)
unset(CMAKE_Fortran_ABI_FILES)
endif()
+if(CMAKE_Fortran_COMPILER_LINKS_STATICALLY)
+ set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
+endif()
+
# This should be included before the _INIT variables are
# used to initialize the cache. Since the rule variables
# have if blocks on them, users can still define them here.
diff --git a/Modules/Platform/Linux-Cray-C.cmake
b/Modules/Platform/Linux-Cray-C.cmake
deleted file mode 100644
index f87725f..0000000
--- a/Modules/Platform/Linux-Cray-C.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-include(Platform/Linux-Cray)
-__linux_compiler_cray(C)
diff --git a/Modules/Platform/Linux-Cray-CXX.cmake
b/Modules/Platform/Linux-Cray-CXX.cmake
deleted file mode 100644
index 8b63285..0000000
--- a/Modules/Platform/Linux-Cray-CXX.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-include(Platform/Linux-Cray)
-__linux_compiler_cray(CXX)
diff --git a/Modules/Platform/Linux-Cray-Fortran.cmake
b/Modules/Platform/Linux-Cray-Fortran.cmake
deleted file mode 100644
index 076f394..0000000
--- a/Modules/Platform/Linux-Cray-Fortran.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-include(Platform/Linux-Cray)
-__linux_compiler_cray(Fortran)
diff --git a/Modules/Platform/Linux-Cray.cmake
b/Modules/Platform/Linux-Cray.cmake
deleted file mode 100644
index 8453875..0000000
--- a/Modules/Platform/Linux-Cray.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#=============================================================================
-# Copyright 2015 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(__LINUX_COMPILER_CRAY)
- return()
-endif()
-set(__LINUX_COMPILER_CRAY 1)
-
-macro(__linux_compiler_cray lang)
- if(CMAKE_${lang}_COMPILER_LINKS_STATICALLY)
- set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
- endif()
-endmacro()
diff --git a/Modules/Platform/Linux-GNU.cmake b/Modules/Platform/Linux-GNU.cmake
index a18edc7..0e254c6 100644
--- a/Modules/Platform/Linux-GNU.cmake
+++ b/Modules/Platform/Linux-GNU.cmake
@@ -22,8 +22,4 @@ macro(__linux_compiler_gnu lang)
# We pass this for historical reasons. Projects may have
# executables that use dlopen but do not set ENABLE_EXPORTS.
set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-rdynamic")
-
- if(CMAKE_${lang}_COMPILER_LINKS_STATICALLY)
- set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
- endif()
endmacro()
diff --git a/Modules/Platform/Linux-Intel.cmake
b/Modules/Platform/Linux-Intel.cmake
index 75e2cea..20fddb4 100644
--- a/Modules/Platform/Linux-Intel.cmake
+++ b/Modules/Platform/Linux-Intel.cmake
@@ -51,8 +51,4 @@ macro(__linux_compiler_intel lang)
if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 12.0)
set(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
endif()
-
- if(CMAKE_${lang}_COMPILER_LINKS_STATICALLY)
- set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
- endif()
endmacro()
diff --git a/Modules/Platform/Linux-PGI.cmake b/Modules/Platform/Linux-PGI.cmake
index 861c5d4..baa2248 100644
--- a/Modules/Platform/Linux-PGI.cmake
+++ b/Modules/Platform/Linux-PGI.cmake
@@ -24,8 +24,4 @@ macro(__linux_compiler_pgi lang)
set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "")
set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-fPIC")
set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-shared")
-
- if(CMAKE_${lang}_COMPILER_LINKS_STATICALLY)
- set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
- endif()
endmacro()
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeCInformation.cmake | 4 ++++
Modules/CMakeCXXInformation.cmake | 4 ++++
Modules/CMakeFortranInformation.cmake | 4 ++++
Modules/Platform/Linux-Cray-C.cmake | 2 --
Modules/Platform/Linux-Cray-CXX.cmake | 2 --
Modules/Platform/Linux-Cray-Fortran.cmake | 2 --
Modules/Platform/Linux-Cray.cmake | 25 -------------------------
Modules/Platform/Linux-GNU.cmake | 4 ----
Modules/Platform/Linux-Intel.cmake | 4 ----
Modules/Platform/Linux-PGI.cmake | 4 ----
10 files changed, 12 insertions(+), 43 deletions(-)
delete mode 100644 Modules/Platform/Linux-Cray-C.cmake
delete mode 100644 Modules/Platform/Linux-Cray-CXX.cmake
delete mode 100644 Modules/Platform/Linux-Cray-Fortran.cmake
delete mode 100644 Modules/Platform/Linux-Cray.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
