[Cmake-commits] CMake branch, next, updated. v3.6.2-2034-g8bc030b
Brad King
brad.king at kitware.com
Wed Sep 14 10:52:19 EDT 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 8bc030bb2542e02675bacf4dcb219a7f42bb7025 (commit)
via 152bbe5068fc125351f728f04a14113e08f87671 (commit)
via a6d3f5418c4f2c1bd99272a9fac1cf4e33b1df09 (commit)
from 722a08d1e829205e8ee91f7c5c9983eac047d0d5 (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=8bc030bb2542e02675bacf4dcb219a7f42bb7025
commit 8bc030bb2542e02675bacf4dcb219a7f42bb7025
Merge: 722a08d 152bbe5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 14 10:52:18 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 14 10:52:18 2016 -0400
Merge topic 'fix-CMAKE_COMPILER_IS_GNU-confusion' into next
152bbe50 Modules: Fix typos in name of `CMAKE_COMPILER_IS_GNUCC` variable
a6d3f541 Help: Clarify documentation of CMAKE_COMPILER_IS_GNU{CC,CXX,G77}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=152bbe5068fc125351f728f04a14113e08f87671
commit 152bbe5068fc125351f728f04a14113e08f87671
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 14 10:11:43 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 14 10:12:30 2016 -0400
Modules: Fix typos in name of `CMAKE_COMPILER_IS_GNUCC` variable
It is not called `CMAKE_COMPILER_IS_GNUC` (without last `C`).
Closes: #16297
diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index 3c053fa..535f68b 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -64,7 +64,7 @@ endif()
# Workaround for short jump tables on PA-RISC
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^parisc")
- if(CMAKE_COMPILER_IS_GNUC)
+ if(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-calls")
endif()
if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index e33b927..bacf137 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -208,7 +208,7 @@ macro(_test_compiler_hidden_visibility)
if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.2")
set(GCC_TOO_OLD TRUE)
- elseif(CMAKE_COMPILER_IS_GNUC AND CMAKE_C_COMPILER_VERSION VERSION_LESS "4.2")
+ elseif(CMAKE_COMPILER_IS_GNUCC AND CMAKE_C_COMPILER_VERSION VERSION_LESS "4.2")
set(GCC_TOO_OLD TRUE)
elseif(CMAKE_CXX_COMPILER_ID MATCHES Intel AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "12.0")
set(_INTEL_TOO_OLD TRUE)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6d3f5418c4f2c1bd99272a9fac1cf4e33b1df09
commit a6d3f5418c4f2c1bd99272a9fac1cf4e33b1df09
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 14 10:09:39 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 14 10:09:39 2016 -0400
Help: Clarify documentation of CMAKE_COMPILER_IS_GNU{CC,CXX,G77}
Closes: #16308
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index b14f667..74c9265 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -332,7 +332,9 @@ Variables for Languages
.. toctree::
:maxdepth: 1
- /variable/CMAKE_COMPILER_IS_GNULANG
+ /variable/CMAKE_COMPILER_IS_GNUCC
+ /variable/CMAKE_COMPILER_IS_GNUCXX
+ /variable/CMAKE_COMPILER_IS_GNUG77
/variable/CMAKE_C_COMPILE_FEATURES
/variable/CMAKE_C_EXTENSIONS
/variable/CMAKE_C_STANDARD
diff --git a/Help/variable/CMAKE_COMPILER_IS_GNUCC.rst b/Help/variable/CMAKE_COMPILER_IS_GNUCC.rst
new file mode 100644
index 0000000..a40667e
--- /dev/null
+++ b/Help/variable/CMAKE_COMPILER_IS_GNUCC.rst
@@ -0,0 +1,5 @@
+CMAKE_COMPILER_IS_GNUCC
+-----------------------
+
+True if the ``C`` compiler is GNU.
+Use :variable:`CMAKE_C_COMPILER_ID <CMAKE_<LANG>_COMPILER_ID>` instead.
diff --git a/Help/variable/CMAKE_COMPILER_IS_GNUCXX.rst b/Help/variable/CMAKE_COMPILER_IS_GNUCXX.rst
new file mode 100644
index 0000000..f1f5cf7
--- /dev/null
+++ b/Help/variable/CMAKE_COMPILER_IS_GNUCXX.rst
@@ -0,0 +1,5 @@
+CMAKE_COMPILER_IS_GNUCXX
+------------------------
+
+True if the C++ (``CXX``) compiler is GNU.
+Use :variable:`CMAKE_CXX_COMPILER_ID <CMAKE_<LANG>_COMPILER_ID>` instead.
diff --git a/Help/variable/CMAKE_COMPILER_IS_GNUG77.rst b/Help/variable/CMAKE_COMPILER_IS_GNUG77.rst
new file mode 100644
index 0000000..3d6dab4
--- /dev/null
+++ b/Help/variable/CMAKE_COMPILER_IS_GNUG77.rst
@@ -0,0 +1,5 @@
+CMAKE_COMPILER_IS_GNUG77
+------------------------
+
+True if the ``Fortran`` compiler is GNU.
+Use :variable:`CMAKE_Fortran_COMPILER_ID <CMAKE_<LANG>_COMPILER_ID>` instead.
diff --git a/Help/variable/CMAKE_COMPILER_IS_GNULANG.rst b/Help/variable/CMAKE_COMPILER_IS_GNULANG.rst
deleted file mode 100644
index 4b652c0..0000000
--- a/Help/variable/CMAKE_COMPILER_IS_GNULANG.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-CMAKE_COMPILER_IS_GNU<LANG>
----------------------------
-
-True if the compiler is GNU.
-
-If the selected ``<LANG>`` compiler is the GNU compiler then this is ``TRUE``,
-if not it is ``FALSE``. Unlike the other per-language variables, this
-uses the GNU syntax for identifying languages instead of the CMake
-syntax. Recognized values of the ``<LANG>`` suffix are:
-
-::
-
- CC = C compiler
- CXX = C++ compiler
- G77 = Fortran compiler
-----------------------------------------------------------------------
Summary of changes:
CompileFlags.cmake | 2 +-
Help/manual/cmake-variables.7.rst | 4 +++-
Help/variable/CMAKE_COMPILER_IS_GNUCC.rst | 5 +++++
Help/variable/CMAKE_COMPILER_IS_GNUCXX.rst | 5 +++++
Help/variable/CMAKE_COMPILER_IS_GNUG77.rst | 5 +++++
Help/variable/CMAKE_COMPILER_IS_GNULANG.rst | 15 ---------------
Modules/GenerateExportHeader.cmake | 2 +-
7 files changed, 20 insertions(+), 18 deletions(-)
create mode 100644 Help/variable/CMAKE_COMPILER_IS_GNUCC.rst
create mode 100644 Help/variable/CMAKE_COMPILER_IS_GNUCXX.rst
create mode 100644 Help/variable/CMAKE_COMPILER_IS_GNUG77.rst
delete mode 100644 Help/variable/CMAKE_COMPILER_IS_GNULANG.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list