[Cmake-commits] CMake branch, next, updated. v2.8.12-4594-ga8cf6cc
Stephen Kelly
steveire at gmail.com
Tue Oct 29 03:28:58 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 a8cf6cc495756a9735a561a8de8e6f806935a78f (commit)
via c2e6ef42eaded1c2d52f3c8231c15be41c558ddf (commit)
from 89ecde2d5776bf0b98a4be35a83bac2e19f1e67d (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=a8cf6cc495756a9735a561a8de8e6f806935a78f
commit a8cf6cc495756a9735a561a8de8e6f806935a78f
Merge: 89ecde2 c2e6ef4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 29 03:28:51 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 29 03:28:51 2013 -0400
Merge topic 'target_compiler_features' into next
c2e6ef4 Revert "Add the WriteCompilerDetectionHeader module."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2e6ef42eaded1c2d52f3c8231c15be41c558ddf
commit c2e6ef42eaded1c2d52f3c8231c15be41c558ddf
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 29 08:28:05 2013 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 29 08:28:05 2013 +0100
Revert "Add the WriteCompilerDetectionHeader module."
This reverts commit 30f7e101a948190d1ff94ad4860c9d404d8be247.
diff --git a/Modules/Compiler/Clang-features.cmake b/Modules/Compiler/Clang-features.cmake
index 012502d..074e5a1 100644
--- a/Modules/Compiler/Clang-features.cmake
+++ b/Modules/Compiler/Clang-features.cmake
@@ -1,6 +1,4 @@
-set(compiler_test_macro __clang__)
-
set(testable_features
cxx_delegating_constructors
)
diff --git a/Modules/Compiler/GNU-features.cmake b/Modules/Compiler/GNU-features.cmake
index 169a6a9..bb63250 100644
--- a/Modules/Compiler/GNU-features.cmake
+++ b/Modules/Compiler/GNU-features.cmake
@@ -1,4 +1,2 @@
-set(compiler_test_macro __GNUC__)
-
set(feature_test_cxx_delegating_constructors "(__GNUC__ * 100 + __GNUC_MINOR__) >= 407")
diff --git a/Modules/Compiler/Intel-features.cmake b/Modules/Compiler/Intel-features.cmake
index b074912..07676a0 100644
--- a/Modules/Compiler/Intel-features.cmake
+++ b/Modules/Compiler/Intel-features.cmake
@@ -1,4 +1,2 @@
-set(compiler_test_macro __INTEL_COMPILER)
-
set(feature_test_cxx_delegating_constructors "__INTEL_COMPILER >= 1400")
diff --git a/Modules/Compiler/XL-features.cmake b/Modules/Compiler/XL-features.cmake
index cfbaa3c..64dcb2c 100644
--- a/Modules/Compiler/XL-features.cmake
+++ b/Modules/Compiler/XL-features.cmake
@@ -1,4 +1,2 @@
-set(compiler_test_macro __IBMCPP__)
-
set(feature_test_cxx_delegating_constructors "__IBMCPP__ >= 1110")
diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake
deleted file mode 100644
index 4fadbb1..0000000
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ /dev/null
@@ -1,89 +0,0 @@
-
-#=============================================================================
-# Copyright 2013 Stephen Kelly <steveire at gmail.com>
-#
-# 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(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
-
-function(_load_compiler_variables CompilerId)
- include("${CMAKE_ROOT}/Modules/Compiler/${CompilerId}-features.cmake" OPTIONAL)
- if (NOT compiler_test_macro)
- message(FATAL_ERROR "Compiler ${CompilerId} does not define compiler_test_macro")
- endif()
- foreach(feature ${ARGN})
- set(x ${feature_tests_${feature}})
- if (feature_test_${feature})
- list(APPEND x "(defined (${compiler_test_macro}) && ${feature_test_${feature}})")
- set(feature_tests_${feature} ${x} PARENT_SCOPE)
- endif()
- endforeach()
-endfunction()
-
-function(write_compiler_detection_header
- file_keyword file_arg
- prefix_keyword prefix_arg
- )
- if (NOT file_keyword STREQUAL FILE)
- message(FATAL_ERROR "Wrong parameters for function.")
- endif()
- if (NOT prefix_keyword STREQUAL PREFIX)
- message(FATAL_ERROR "Wrong parameters for function.")
- endif()
- set(options)
- set(oneValueArgs VERSION)
- set(multiValueArgs COMPILERS FEATURES)
- cmake_parse_arguments(_WCD "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
- if(_WCD_UNPARSED_ARGUMENTS)
- message(FATAL_ERROR "Unparsed arguments: ${_WCD_UNPARSED_ARGUMENTS}")
- endif()
-
- if(NOT _WCD_VERSION)
- set(_WCD_VERSION ${CMAKE_MINIMUM_REQUIRED_VERSION})
- endif()
-# if (_WCD_VERSION VERSION_LESS 3.0.0) # Version which introduced this function
-# if (_WCD_VERSION VERSION_LESS 2.8.12.20131023)
-# message(FATAL_ERROR "VERSION parameter too low.")
-# endif()
-
- file(WRITE ${file_arg} "
-// This is a generated file. Do not edit!
-
-#ifndef ${prefix_arg}_COMPILER_DETECTION_H
-#define ${prefix_arg}_COMPILER_DETECTION_H
-")
-
- foreach(ordered_compiler
- # Order is relevant here. We need to list the compilers which pretend to
- # be GNU/MSVC before the actual GNU/MSVC compiler.
- XL
- Intel
- Clang
- GNU
- )
- list(FIND _WCD_COMPILERS ${ordered_compiler} idx)
- if (NOT idx EQUAL -1)
- _load_compiler_variables(${ordered_compiler} ${_WCD_FEATURES})
- endif()
- endforeach()
-
- foreach(feature ${_WCD_FEATURES})
- set(_define_check "\n#define ${prefix_arg}_${CMAKE_PP_NAME_${feature}} 0\n")
- if (feature_tests_${feature})
- string(REPLACE ";" " \\\n || " feature_tests_${feature} "${feature_tests_${feature}}")
- set(_define_check "\n#if ${feature_tests_${feature}}\n#define ${prefix_arg}_${CMAKE_PP_NAME_${feature}} 1\n#else${_define_check}#endif\n")
- endif()
- file(APPEND "${file_arg}" "${_define_check}")
- endforeach()
-
- file(APPEND ${file_arg} "\n#endif\n")
-endfunction()
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/Clang-features.cmake | 2 -
Modules/Compiler/GNU-features.cmake | 2 -
Modules/Compiler/Intel-features.cmake | 2 -
Modules/Compiler/XL-features.cmake | 2 -
Modules/WriteCompilerDetectionHeader.cmake | 89 ----------------------------
5 files changed, 0 insertions(+), 97 deletions(-)
delete mode 100644 Modules/WriteCompilerDetectionHeader.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list