[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2942-gdc89cd3
Stephen Kelly
steveire at gmail.com
Wed May 7 07:35:26 EDT 2014
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 dc89cd3aecd5b86df0d010145e9aa9cb6f8641c2 (commit)
via ac7e65a510d212c25123759597fbcb93fcb3ddfc (commit)
from 2cf478f81ccd0a5f58d3c4e5de76ea8164b3fc7d (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=dc89cd3aecd5b86df0d010145e9aa9cb6f8641c2
commit dc89cd3aecd5b86df0d010145e9aa9cb6f8641c2
Merge: 2cf478f ac7e65a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 7 07:35:24 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 7 07:35:24 2014 -0400
Merge topic 'compiler-id-refactor' into next
ac7e65a5 Rename files which are identical for the C version.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac7e65a510d212c25123759597fbcb93fcb3ddfc
commit ac7e65a510d212c25123759597fbcb93fcb3ddfc
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 7 12:58:06 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 7 13:31:18 2014 +0200
Rename files which are identical for the C version.
diff --git a/Modules/CMakeCompilerIdDetection.cmake b/Modules/CMakeCompilerIdDetection.cmake
index 8cbfc4e..f0e39ad 100644
--- a/Modules/CMakeCompilerIdDetection.cmake
+++ b/Modules/CMakeCompilerIdDetection.cmake
@@ -24,9 +24,15 @@ include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
function(compiler_id_detection outvar lang)
- file(GLOB files
+ file(GLOB lang_files
"${CMAKE_ROOT}/Modules/Compiler/*-${lang}-DetermineCompiler.cmake")
+ if (NOT lang STREQUAL Fortran)
+ file(GLOB non_lang_files
+ "${CMAKE_ROOT}/Modules/Compiler/*-DetermineCompiler.cmake")
+ endif()
+
+ set(files ${lang_files} ${non_lang_files})
if (files)
foreach(file ${files})
_readFile(${file})
diff --git a/Modules/Compiler/AppleClang-CXX-DetermineCompiler.cmake b/Modules/Compiler/AppleClang-DetermineCompiler.cmake
similarity index 73%
rename from Modules/Compiler/AppleClang-CXX-DetermineCompiler.cmake
rename to Modules/Compiler/AppleClang-DetermineCompiler.cmake
index 14fff5a..d293b7b 100644
--- a/Modules/Compiler/AppleClang-CXX-DetermineCompiler.cmake
+++ b/Modules/Compiler/AppleClang-DetermineCompiler.cmake
@@ -1,7 +1,7 @@
set(_compiler_id_pp_test "defined(__clang__) && defined(__apple_build_version__)")
-include("${CMAKE_CURRENT_LIST_DIR}/Clang-CXX-DetermineCompilerInternal.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/Clang-DetermineCompilerInternal.cmake")
set(_compiler_id_version_compute "${_compiler_id_version_compute}
# define @PREFIX at COMPILER_VERSION_TWEAK DEC(__apple_build_version__)")
diff --git a/Modules/Compiler/Borland-CXX-DetermineCompiler.cmake b/Modules/Compiler/Borland-DetermineCompiler.cmake
similarity index 100%
rename from Modules/Compiler/Borland-CXX-DetermineCompiler.cmake
rename to Modules/Compiler/Borland-DetermineCompiler.cmake
diff --git a/Modules/Compiler/Clang-CXX-DetermineCompiler.cmake b/Modules/Compiler/Clang-CXX-DetermineCompiler.cmake
deleted file mode 100644
index a28d083..0000000
--- a/Modules/Compiler/Clang-CXX-DetermineCompiler.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-
-set(_compiler_id_pp_test "defined(__clang__)")
-
-include("${CMAKE_CURRENT_LIST_DIR}/Clang-CXX-DetermineCompilerInternal.cmake")
diff --git a/Modules/Compiler/Clang-DetermineCompiler.cmake b/Modules/Compiler/Clang-DetermineCompiler.cmake
new file mode 100644
index 0000000..89df1b6
--- /dev/null
+++ b/Modules/Compiler/Clang-DetermineCompiler.cmake
@@ -0,0 +1,4 @@
+
+set(_compiler_id_pp_test "defined(__clang__)")
+
+include("${CMAKE_CURRENT_LIST_DIR}/Clang-DetermineCompilerInternal.cmake")
diff --git a/Modules/Compiler/Clang-CXX-DetermineCompilerInternal.cmake b/Modules/Compiler/Clang-DetermineCompilerInternal.cmake
similarity index 100%
rename from Modules/Compiler/Clang-CXX-DetermineCompilerInternal.cmake
rename to Modules/Compiler/Clang-DetermineCompilerInternal.cmake
diff --git a/Modules/Compiler/Cray-CXX-DetermineCompiler.cmake b/Modules/Compiler/Cray-DetermineCompiler.cmake
similarity index 100%
rename from Modules/Compiler/Cray-CXX-DetermineCompiler.cmake
rename to Modules/Compiler/Cray-DetermineCompiler.cmake
diff --git a/Modules/Compiler/Embarcadero-CXX-DetermineCompiler.cmake b/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
similarity index 100%
rename from Modules/Compiler/Embarcadero-CXX-DetermineCompiler.cmake
rename to Modules/Compiler/Embarcadero-DetermineCompiler.cmake
diff --git a/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake b/Modules/Compiler/GNU-DetermineCompiler.cmake
similarity index 100%
rename from Modules/Compiler/GNU-CXX-DetermineCompiler.cmake
rename to Modules/Compiler/GNU-DetermineCompiler.cmake
diff --git a/Modules/Compiler/IAR-CXX-DetermineCompiler.cmake b/Modules/Compiler/IAR-DetermineCompiler.cmake
similarity index 100%
rename from Modules/Compiler/IAR-CXX-DetermineCompiler.cmake
rename to Modules/Compiler/IAR-DetermineCompiler.cmake
diff --git a/Modules/Compiler/Intel-CXX-DetermineCompiler.cmake b/Modules/Compiler/Intel-DetermineCompiler.cmake
similarity index 100%
rename from Modules/Compiler/Intel-CXX-DetermineCompiler.cmake
rename to Modules/Compiler/Intel-DetermineCompiler.cmake
diff --git a/Modules/Compiler/MIPSpro-CXX-DetermineCompiler.cmake b/Modules/Compiler/MIPSpro-DetermineCompiler.cmake
similarity index 100%
rename from Modules/Compiler/MIPSpro-CXX-DetermineCompiler.cmake
rename to Modules/Compiler/MIPSpro-DetermineCompiler.cmake
diff --git a/Modules/Compiler/MSVC-CXX-DetermineCompiler.cmake b/Modules/Compiler/MSVC-DetermineCompiler.cmake
similarity index 100%
rename from Modules/Compiler/MSVC-CXX-DetermineCompiler.cmake
rename to Modules/Compiler/MSVC-DetermineCompiler.cmake
diff --git a/Modules/Compiler/OpenWatcom-CXX-DetermineCompiler.cmake b/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake
similarity index 100%
rename from Modules/Compiler/OpenWatcom-CXX-DetermineCompiler.cmake
rename to Modules/Compiler/OpenWatcom-DetermineCompiler.cmake
diff --git a/Modules/Compiler/PGI-CXX-DetermineCompiler.cmake b/Modules/Compiler/PGI-DetermineCompiler.cmake
similarity index 100%
rename from Modules/Compiler/PGI-CXX-DetermineCompiler.cmake
rename to Modules/Compiler/PGI-DetermineCompiler.cmake
diff --git a/Modules/Compiler/PathScale-CXX-DetermineCompiler.cmake b/Modules/Compiler/PathScale-DetermineCompiler.cmake
similarity index 100%
rename from Modules/Compiler/PathScale-CXX-DetermineCompiler.cmake
rename to Modules/Compiler/PathScale-DetermineCompiler.cmake
diff --git a/Modules/Compiler/SCO-CXX-DetermineCompiler.cmake b/Modules/Compiler/SCO-DetermineCompiler.cmake
similarity index 100%
rename from Modules/Compiler/SCO-CXX-DetermineCompiler.cmake
rename to Modules/Compiler/SCO-DetermineCompiler.cmake
diff --git a/Modules/Compiler/TI-CXX-DetermineCompiler.cmake b/Modules/Compiler/TI-DetermineCompiler.cmake
similarity index 100%
rename from Modules/Compiler/TI-CXX-DetermineCompiler.cmake
rename to Modules/Compiler/TI-DetermineCompiler.cmake
diff --git a/Modules/Compiler/Watcom-CXX-DetermineCompiler.cmake b/Modules/Compiler/Watcom-DetermineCompiler.cmake
similarity index 100%
rename from Modules/Compiler/Watcom-CXX-DetermineCompiler.cmake
rename to Modules/Compiler/Watcom-DetermineCompiler.cmake
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeCompilerIdDetection.cmake | 8 +++++++-
...ermineCompiler.cmake => AppleClang-DetermineCompiler.cmake} | 2 +-
...DetermineCompiler.cmake => Borland-DetermineCompiler.cmake} | 0
Modules/Compiler/Clang-CXX-DetermineCompiler.cmake | 4 ----
Modules/Compiler/Clang-DetermineCompiler.cmake | 4 ++++
...lerInternal.cmake => Clang-DetermineCompilerInternal.cmake} | 0
...XX-DetermineCompiler.cmake => Cray-DetermineCompiler.cmake} | 0
...rmineCompiler.cmake => Embarcadero-DetermineCompiler.cmake} | 0
...CXX-DetermineCompiler.cmake => GNU-DetermineCompiler.cmake} | 0
...CXX-DetermineCompiler.cmake => IAR-DetermineCompiler.cmake} | 0
...X-DetermineCompiler.cmake => Intel-DetermineCompiler.cmake} | 0
...DetermineCompiler.cmake => MIPSpro-DetermineCompiler.cmake} | 0
...XX-DetermineCompiler.cmake => MSVC-DetermineCompiler.cmake} | 0
...ermineCompiler.cmake => OpenWatcom-DetermineCompiler.cmake} | 0
...CXX-DetermineCompiler.cmake => PGI-DetermineCompiler.cmake} | 0
...termineCompiler.cmake => PathScale-DetermineCompiler.cmake} | 0
...CXX-DetermineCompiler.cmake => SCO-DetermineCompiler.cmake} | 0
...-CXX-DetermineCompiler.cmake => TI-DetermineCompiler.cmake} | 0
...-DetermineCompiler.cmake => Watcom-DetermineCompiler.cmake} | 0
19 files changed, 12 insertions(+), 6 deletions(-)
rename Modules/Compiler/{AppleClang-CXX-DetermineCompiler.cmake => AppleClang-DetermineCompiler.cmake} (73%)
rename Modules/Compiler/{Borland-CXX-DetermineCompiler.cmake => Borland-DetermineCompiler.cmake} (100%)
delete mode 100644 Modules/Compiler/Clang-CXX-DetermineCompiler.cmake
create mode 100644 Modules/Compiler/Clang-DetermineCompiler.cmake
rename Modules/Compiler/{Clang-CXX-DetermineCompilerInternal.cmake => Clang-DetermineCompilerInternal.cmake} (100%)
rename Modules/Compiler/{Cray-CXX-DetermineCompiler.cmake => Cray-DetermineCompiler.cmake} (100%)
rename Modules/Compiler/{Embarcadero-CXX-DetermineCompiler.cmake => Embarcadero-DetermineCompiler.cmake} (100%)
rename Modules/Compiler/{GNU-CXX-DetermineCompiler.cmake => GNU-DetermineCompiler.cmake} (100%)
rename Modules/Compiler/{IAR-CXX-DetermineCompiler.cmake => IAR-DetermineCompiler.cmake} (100%)
rename Modules/Compiler/{Intel-CXX-DetermineCompiler.cmake => Intel-DetermineCompiler.cmake} (100%)
rename Modules/Compiler/{MIPSpro-CXX-DetermineCompiler.cmake => MIPSpro-DetermineCompiler.cmake} (100%)
rename Modules/Compiler/{MSVC-CXX-DetermineCompiler.cmake => MSVC-DetermineCompiler.cmake} (100%)
rename Modules/Compiler/{OpenWatcom-CXX-DetermineCompiler.cmake => OpenWatcom-DetermineCompiler.cmake} (100%)
rename Modules/Compiler/{PGI-CXX-DetermineCompiler.cmake => PGI-DetermineCompiler.cmake} (100%)
rename Modules/Compiler/{PathScale-CXX-DetermineCompiler.cmake => PathScale-DetermineCompiler.cmake} (100%)
rename Modules/Compiler/{SCO-CXX-DetermineCompiler.cmake => SCO-DetermineCompiler.cmake} (100%)
rename Modules/Compiler/{TI-CXX-DetermineCompiler.cmake => TI-DetermineCompiler.cmake} (100%)
rename Modules/Compiler/{Watcom-CXX-DetermineCompiler.cmake => Watcom-DetermineCompiler.cmake} (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list