[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3157-gd62624b
Brad King
brad.king at kitware.com
Tue Jul 16 09:31:02 EDT 2013
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 d62624b5011b538bb7df463101a1cd0295336626 (commit)
via 1af8c8ddae9746663dca9dfbee8ab7a31cbe4fb0 (commit)
via 2cc9f1fd5cece37efe00dde8a70a632eeb113112 (commit)
from 2548e1368baff7cb1dc1c1296d5e4c6f89516ac2 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d62624b5011b538bb7df463101a1cd0295336626
commit d62624b5011b538bb7df463101a1cd0295336626
Merge: 2548e13 1af8c8d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 16 09:30:58 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 16 09:30:58 2013 -0400
Merge topic 'osx-fortran-dylib-versions' into next
1af8c8d OS X: Add Fortran library version flags (#14249)
2cc9f1f OS X: Add copyright notices to Darwin-*-Fortran.cmake
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1af8c8ddae9746663dca9dfbee8ab7a31cbe4fb0
commit 1af8c8ddae9746663dca9dfbee8ab7a31cbe4fb0
Author: Graham Markall <graham at opengamma.com>
AuthorDate: Tue Jul 16 13:45:10 2013 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 16 09:27:50 2013 -0400
OS X: Add Fortran library version flags (#14249)
The linker flags for setting the compatibility and current versions of
libraries on Darwin are set for the supported Fortran compilers.
Set CMAKE_Fortran_CREATE_SHARED_LIBRARY for the NAG Fortran compiler to
have no space after <SONAME_FLAG> so the NAG compiler can parse the
argument correctly.
diff --git a/Modules/Platform/Darwin-Absoft-Fortran.cmake b/Modules/Platform/Darwin-Absoft-Fortran.cmake
index 47dbd58..dc62b0d 100644
--- a/Modules/Platform/Darwin-Absoft-Fortran.cmake
+++ b/Modules/Platform/Darwin-Absoft-Fortran.cmake
@@ -1,5 +1,6 @@
#=============================================================================
# Copyright 2011 Kitware, Inc.
+# Copyright 2013 OpenGamma Ltd. <graham at opengamma.com>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -12,3 +13,6 @@
# License text for the above reference.)
set(CMAKE_Fortran_VERBOSE_FLAG "-X -v") # Runs gcc under the hood.
+
+set(CMAKE_Fortran_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ")
+set(CMAKE_Fortran_OSX_CURRENT_VERSION_FLAG "-current_version ")
diff --git a/Modules/Platform/Darwin-GNU-Fortran.cmake b/Modules/Platform/Darwin-GNU-Fortran.cmake
index c5ffc6f..f4b509a 100644
--- a/Modules/Platform/Darwin-GNU-Fortran.cmake
+++ b/Modules/Platform/Darwin-GNU-Fortran.cmake
@@ -1,5 +1,6 @@
#=============================================================================
# Copyright 2009 Kitware, Inc.
+# Copyright 2013 OpenGamma Ltd. <graham at opengamma.com>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -13,3 +14,6 @@
include(Platform/Darwin-GNU)
__darwin_compiler_gnu(Fortran)
+
+set(CMAKE_Fortran_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ")
+set(CMAKE_Fortran_OSX_CURRENT_VERSION_FLAG "-current_version ")
diff --git a/Modules/Platform/Darwin-Absoft-Fortran.cmake b/Modules/Platform/Darwin-Intel-Fortran.cmake
similarity index 74%
copy from Modules/Platform/Darwin-Absoft-Fortran.cmake
copy to Modules/Platform/Darwin-Intel-Fortran.cmake
index 47dbd58..6bd45f1 100644
--- a/Modules/Platform/Darwin-Absoft-Fortran.cmake
+++ b/Modules/Platform/Darwin-Intel-Fortran.cmake
@@ -1,5 +1,5 @@
#=============================================================================
-# Copyright 2011 Kitware, Inc.
+# Copyright 2013 OpenGamma Ltd. <graham at opengamma.com>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -11,4 +11,5 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
-set(CMAKE_Fortran_VERBOSE_FLAG "-X -v") # Runs gcc under the hood.
+set(CMAKE_Fortran_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ")
+set(CMAKE_Fortran_OSX_CURRENT_VERSION_FLAG "-current_version ")
diff --git a/Modules/Platform/Darwin-NAG-Fortran.cmake b/Modules/Platform/Darwin-NAG-Fortran.cmake
index 14437f0..4c28e62 100644
--- a/Modules/Platform/Darwin-NAG-Fortran.cmake
+++ b/Modules/Platform/Darwin-NAG-Fortran.cmake
@@ -1,5 +1,6 @@
#=============================================================================
# Copyright 2010 Kitware, Inc.
+# Copyright 2013 OpenGamma Ltd. <graham at opengamma.com>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -16,3 +17,10 @@ set(CMAKE_Fortran_VERBOSE_FLAG "-Wl,-v") # Runs gcc under the hood.
# Need -fpp explicitly on case-insensitive filesystem.
set(CMAKE_Fortran_COMPILE_OBJECT
"<CMAKE_Fortran_COMPILER> -fpp -o <OBJECT> <DEFINES> <FLAGS> -c <SOURCE>")
+
+set(CMAKE_Fortran_OSX_COMPATIBILITY_VERSION_FLAG "-Wl,-compatibility_version -Wl,")
+set(CMAKE_Fortran_OSX_CURRENT_VERSION_FLAG "-Wl,-current_version -Wl,")
+set(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "-Wl,-shared")
+set(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG "-Wl,-install_name -Wl,")
+set(CMAKE_Fortran_CREATE_SHARED_LIBRARY
+ "<CMAKE_Fortran_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS> <LINK_FLAGS> -o <TARGET> <SONAME_FLAG><TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cc9f1fd5cece37efe00dde8a70a632eeb113112
commit 2cc9f1fd5cece37efe00dde8a70a632eeb113112
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 16 09:21:35 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 16 09:25:06 2013 -0400
OS X: Add copyright notices to Darwin-*-Fortran.cmake
diff --git a/Modules/Platform/Darwin-Absoft-Fortran.cmake b/Modules/Platform/Darwin-Absoft-Fortran.cmake
index beb41a3..47dbd58 100644
--- a/Modules/Platform/Darwin-Absoft-Fortran.cmake
+++ b/Modules/Platform/Darwin-Absoft-Fortran.cmake
@@ -1 +1,14 @@
+#=============================================================================
+# Copyright 2011 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.)
+
set(CMAKE_Fortran_VERBOSE_FLAG "-X -v") # Runs gcc under the hood.
diff --git a/Modules/Platform/Darwin-GNU-Fortran.cmake b/Modules/Platform/Darwin-GNU-Fortran.cmake
index 8e8acc3..c5ffc6f 100644
--- a/Modules/Platform/Darwin-GNU-Fortran.cmake
+++ b/Modules/Platform/Darwin-GNU-Fortran.cmake
@@ -1,2 +1,15 @@
+#=============================================================================
+# Copyright 2009 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.)
+
include(Platform/Darwin-GNU)
__darwin_compiler_gnu(Fortran)
diff --git a/Modules/Platform/Darwin-NAG-Fortran.cmake b/Modules/Platform/Darwin-NAG-Fortran.cmake
index 933f9e1..14437f0 100644
--- a/Modules/Platform/Darwin-NAG-Fortran.cmake
+++ b/Modules/Platform/Darwin-NAG-Fortran.cmake
@@ -1,3 +1,16 @@
+#=============================================================================
+# Copyright 2010 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.)
+
set(CMAKE_Fortran_VERBOSE_FLAG "-Wl,-v") # Runs gcc under the hood.
# Need -fpp explicitly on case-insensitive filesystem.
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/Darwin-Absoft-Fortran.cmake | 17 ++++++++++++++++
Modules/Platform/Darwin-GNU-Fortran.cmake | 17 ++++++++++++++++
.../Darwin-Intel-Fortran.cmake} | 8 ++----
Modules/Platform/Darwin-NAG-Fortran.cmake | 21 ++++++++++++++++++++
4 files changed, 58 insertions(+), 5 deletions(-)
copy Modules/{CMakeBorlandFindMake.cmake => Platform/Darwin-Intel-Fortran.cmake} (74%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list