[Cmake-commits] CMake branch, next, updated. v3.5.2-837-ga53a9b2
Brad King
brad.king at kitware.com
Thu Jun 2 09:55:53 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 a53a9b28e905650205db7e02499f8484b216d3ad (commit)
via f6c21894952fb07e50e511efaa3baded794d631f (commit)
from f84fce7f22efd0066fef03ccc91a9bdb71ed71ea (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=a53a9b28e905650205db7e02499f8484b216d3ad
commit a53a9b28e905650205db7e02499f8484b216d3ad
Merge: f84fce7 f6c2189
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 2 09:55:52 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 2 09:55:52 2016 -0400
Merge topic 'minor-cleanups' into next
f6c21894 Modules: Rename internal platform-specific compiler determination modules
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6c21894952fb07e50e511efaa3baded794d631f
commit f6c21894952fb07e50e511efaa3baded794d631f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu May 26 14:41:23 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 2 09:51:43 2016 -0400
Modules: Rename internal platform-specific compiler determination modules
Rename Modules/Platform/<os>-<lang>.cmake files to
Modules/Platform/<os>-Determine-<lang>.cmake to clarify their role.
For compatibility with user-provided modules, load the old names
if they exist.
diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake
index f8c6303..73d9fb3 100644
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@ -34,6 +34,7 @@
include(${CMAKE_ROOT}/Modules/CMakeDetermineCompiler.cmake)
# Load system-specific compiler preferences for this language.
+include(Platform/${CMAKE_SYSTEM_NAME}-Determine-C OPTIONAL)
include(Platform/${CMAKE_SYSTEM_NAME}-C OPTIONAL)
if(NOT CMAKE_C_COMPILER_NAMES)
set(CMAKE_C_COMPILER_NAMES cc)
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake
index 3c9bbc2..063b68e 100644
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@ -33,6 +33,7 @@
include(${CMAKE_ROOT}/Modules/CMakeDetermineCompiler.cmake)
# Load system-specific compiler preferences for this language.
+include(Platform/${CMAKE_SYSTEM_NAME}-Determine-CXX OPTIONAL)
include(Platform/${CMAKE_SYSTEM_NAME}-CXX OPTIONAL)
if(NOT CMAKE_CXX_COMPILER_NAMES)
set(CMAKE_CXX_COMPILER_NAMES CC)
diff --git a/Modules/CMakeDetermineFortranCompiler.cmake b/Modules/CMakeDetermineFortranCompiler.cmake
index 4f2a70c..0f27a78 100644
--- a/Modules/CMakeDetermineFortranCompiler.cmake
+++ b/Modules/CMakeDetermineFortranCompiler.cmake
@@ -20,6 +20,7 @@
# as a default compiler
include(${CMAKE_ROOT}/Modules/CMakeDetermineCompiler.cmake)
+include(Platform/${CMAKE_SYSTEM_NAME}-Determine-Fortran OPTIONAL)
include(Platform/${CMAKE_SYSTEM_NAME}-Fortran OPTIONAL)
if(NOT CMAKE_Fortran_COMPILER_NAMES)
set(CMAKE_Fortran_COMPILER_NAMES f95)
diff --git a/Modules/Platform/CYGWIN-CXX.cmake b/Modules/Platform/CYGWIN-Determine-CXX.cmake
similarity index 100%
rename from Modules/Platform/CYGWIN-CXX.cmake
rename to Modules/Platform/CYGWIN-Determine-CXX.cmake
diff --git a/Modules/Platform/Darwin-CXX.cmake b/Modules/Platform/Darwin-Determine-CXX.cmake
similarity index 100%
rename from Modules/Platform/Darwin-CXX.cmake
rename to Modules/Platform/Darwin-Determine-CXX.cmake
diff --git a/Modules/Platform/Linux-CXX.cmake b/Modules/Platform/Linux-Determine-CXX.cmake
similarity index 100%
rename from Modules/Platform/Linux-CXX.cmake
rename to Modules/Platform/Linux-Determine-CXX.cmake
diff --git a/Modules/Platform/Windows-CXX.cmake b/Modules/Platform/Windows-Determine-CXX.cmake
similarity index 100%
rename from Modules/Platform/Windows-CXX.cmake
rename to Modules/Platform/Windows-Determine-CXX.cmake
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeDetermineCCompiler.cmake | 1 +
Modules/CMakeDetermineCXXCompiler.cmake | 1 +
Modules/CMakeDetermineFortranCompiler.cmake | 1 +
Modules/Platform/{CYGWIN-CXX.cmake => CYGWIN-Determine-CXX.cmake} | 0
Modules/Platform/{Darwin-CXX.cmake => Darwin-Determine-CXX.cmake} | 0
Modules/Platform/{Linux-CXX.cmake => Linux-Determine-CXX.cmake} | 0
Modules/Platform/{Windows-CXX.cmake => Windows-Determine-CXX.cmake} | 0
7 files changed, 3 insertions(+)
rename Modules/Platform/{CYGWIN-CXX.cmake => CYGWIN-Determine-CXX.cmake} (100%)
rename Modules/Platform/{Darwin-CXX.cmake => Darwin-Determine-CXX.cmake} (100%)
rename Modules/Platform/{Linux-CXX.cmake => Linux-Determine-CXX.cmake} (100%)
rename Modules/Platform/{Windows-CXX.cmake => Windows-Determine-CXX.cmake} (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list