[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2900-g9087e1d
Stephen Kelly
steveire at gmail.com
Wed May 7 06:11:05 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 9087e1d2ec7cb5fa73142f3fefa592e818ae8b36 (commit)
via a9805e393f8b1656a0dfd4ac52b0f02dd68eda05 (commit)
from 2e89142ae0bd2cfeef23cd43c2ab9532101d3f92 (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=9087e1d2ec7cb5fa73142f3fefa592e818ae8b36
commit 9087e1d2ec7cb5fa73142f3fefa592e818ae8b36
Merge: 2e89142 a9805e3
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 7 06:11:03 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 7 06:11:03 2014 -0400
Merge topic 'decay-language-version' into next
a9805e39 Revert topic.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9805e393f8b1656a0dfd4ac52b0f02dd68eda05
commit a9805e393f8b1656a0dfd4ac52b0f02dd68eda05
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 7 12:10:16 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 7 12:10:38 2014 +0200
Revert topic.
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 4e510ac..da21e29 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -109,7 +109,6 @@ Properties on Targets
/prop_tgt/CONFIG_OUTPUT_NAME
/prop_tgt/CONFIG_POSTFIX
/prop_tgt/CXX_STANDARD
- /prop_tgt/CXX_STANDARD_REQUIRED
/prop_tgt/CXX_EXTENSIONS
/prop_tgt/DEBUG_POSTFIX
/prop_tgt/DEFINE_SYMBOL
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 92c1f29..82242f5 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -259,7 +259,6 @@ Variables for Languages
/variable/CMAKE_COMPILER_IS_GNULANG
/variable/CMAKE_CXX_COMPILE_FEATURES
/variable/CMAKE_CXX_STANDARD
- /variable/CMAKE_CXX_STANDARD_REQUIRED
/variable/CMAKE_CXX_EXTENSIONS
/variable/CMAKE_Fortran_MODDIR_DEFAULT
/variable/CMAKE_Fortran_MODDIR_FLAG
diff --git a/Help/prop_tgt/CXX_STANDARD.rst b/Help/prop_tgt/CXX_STANDARD.rst
index fdd5aac..e1b6e78 100644
--- a/Help/prop_tgt/CXX_STANDARD.rst
+++ b/Help/prop_tgt/CXX_STANDARD.rst
@@ -1,27 +1,14 @@
CXX_STANDARD
------------
-The C++ standard whose features are requested to build this target.
+The C++ standard whose features are required to build this target.
-This property specifies the C++ standard whose features are requested
+This property specifies the C++ standard whose features are required
to build this target. For some compilers, this results in adding a
flag such as ``-std=c++11`` to the compile line.
Supported values are ``98`` and ``11``.
-If the value requested does not result in a compile flag being added for
-the compiler in use, a previous standard flag will be added instead. This
-means that using:
-
-.. code-block:: cmake
-
- set_property(TARGET tgt PROPERTY CXX_STANDARD 11)
-
-with a compiler which does not support ``-std=c++11`` or an equivalent
-flag will not result in an error or warning, but will instead add the
-``-std=c++98`` flag if supported. This "decay" behavior may be controlled
-with the :prop_tgt:`CXX_STANDARD_REQUIRED` target property.
-
This property is initialized by the value of
the :variable:`CMAKE_CXX_STANDARD` variable if it is set when a target
is created.
diff --git a/Help/prop_tgt/CXX_STANDARD_REQUIRED.rst b/Help/prop_tgt/CXX_STANDARD_REQUIRED.rst
deleted file mode 100644
index f082805..0000000
--- a/Help/prop_tgt/CXX_STANDARD_REQUIRED.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-CXX_STANDARD_REQUIRED
----------------------
-
-Boolean describing whether the value of :prop_tgt:`CXX_STANDARD` is a requirement.
-
-If this property is set to ``ON``, then the value of the
-:prop_tgt:`CXX_STANDARD` target property is treated as a requirement. If this
-property is ``OFF`` or unset, the :prop_tgt:`CXX_STANDARD` target property is
-treated as optional and may "decay" to a previous standard if the requested is
-not available.
-
-This property is initialized by the value of
-the :variable:`CMAKE_CXX_STANDARD_REQUIRED` variable if it is set when a
-target is created.
diff --git a/Help/variable/CMAKE_CXX_STANDARD_REQUIRED.rst b/Help/variable/CMAKE_CXX_STANDARD_REQUIRED.rst
deleted file mode 100644
index ff005da..0000000
--- a/Help/variable/CMAKE_CXX_STANDARD_REQUIRED.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-CMAKE_CXX_STANDARD_REQUIRED
----------------------------
-
-Default value for ``CXX_STANDARD_REQUIRED`` property of targets.
-
-This variable is used to initialize the :prop_tgt:`CXX_STANDARD_REQUIRED`
-property on all targets. See that target property for additional
-information.
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index b62e697..6ec3958 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -24,8 +24,6 @@ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.3)
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++0x")
endif()
-set(CMAKE_CXX_STANDARD_DEFAULT 98)
-
macro(cmake_record_cxx_compile_features)
macro(_get_gcc_features std_version list)
record_compiler_features(CXX "-std=${std_version}" ${list})
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index afb2ce8..f375b5f 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2152,8 +2152,8 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
return;
}
std::string stdProp = lang + "_STANDARD";
- const char *standardProp = target->GetProperty(stdProp);
- if (!standardProp)
+ const char *standard = target->GetProperty(stdProp);
+ if (!standard)
{
return;
}
@@ -2161,66 +2161,12 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
bool ext = target->GetPropertyAsBool(extProp);
std::string type = ext ? "EXTENSION" : "STANDARD";
- if (target->GetPropertyAsBool(lang + "_STANDARD_REQUIRED"))
+ std::string compile_option =
+ "CMAKE_" + lang + std::string(standard)
+ + "_" + type + "_COMPILE_OPTION";
+ if (const char *opt = target->GetMakefile()->GetDefinition(compile_option))
{
- std::string option_flag =
- "CMAKE_" + lang + standardProp
- + "_" + type + "_COMPILE_OPTION";
-
- const char *opt = target->GetMakefile()->GetDefinition(option_flag);
- if (!opt)
- {
- cmOStringStream e;
- e << "Target \"" << target->GetName() << "\" requires the language "
- "dialect \"" << lang << standardProp << "\" "
- << (ext ? "(with compiler extensions)" : "") << ", but CMake "
- "does not know the compile flags to use to enable it.";
- this->GetMakefile()->IssueMessage(cmake::FATAL_ERROR, e.str());
- }
this->AppendFlags(flags, opt);
- return;
- }
-
- static std::map<std::string, std::vector<std::string> > langStdMap;
- if (langStdMap.empty())
- {
- // Maintain sorted order, most recent first.
- langStdMap["CXX"].push_back("11");
- langStdMap["CXX"].push_back("98");
- }
-
- std::string standard(standardProp);
-
- std::vector<std::string>& stds = langStdMap[lang];
-
- std::vector<std::string>::const_iterator stdIt =
- std::find(stds.begin(), stds.end(), standard);
- assert(stdIt != stds.end());
-
- const char* defaultStd
- = this->Makefile->GetDefinition("CMAKE_" + lang + "_STANDARD_DEFAULT");
- std::vector<std::string>::const_iterator defaultStdIt;
- if (defaultStd)
- {
- defaultStdIt = std::find(stds.begin(), stds.end(), defaultStd);
- assert(defaultStdIt != stds.end());
- }
- else
- {
- defaultStdIt = stds.end() - 1;
- }
-
- for ( ; stdIt <= defaultStdIt; ++stdIt)
- {
- std::string option_flag =
- "CMAKE_" + lang + *stdIt
- + "_" + type + "_COMPILE_OPTION";
-
- if (const char *opt = target->GetMakefile()->GetDefinition(option_flag))
- {
- this->AppendFlags(flags, opt);
- return;
- }
}
}
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 3436bb4..ee6cb44 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -315,7 +315,6 @@ void cmTarget::SetMakefile(cmMakefile* mf)
this->SetPropertyDefault("MACOSX_RPATH", 0);
this->SetPropertyDefault("NO_SYSTEM_FROM_IMPORTED", 0);
this->SetPropertyDefault("CXX_STANDARD", 0);
- this->SetPropertyDefault("CXX_STANDARD_REQUIRED", 0);
this->SetPropertyDefault("CXX_EXTENSIONS", 0);
}
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index a991e77..501138d 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -31,9 +31,6 @@ add_executable(CompileFeatures main.cpp)
set_property(TARGET CompileFeatures
PROPERTY COMPILE_FEATURES "cxx_auto_type"
)
-set_property(TARGET CompileFeatures
- PROPERTY CXX_STANDARD_REQUIRED TRUE
-)
add_executable(GenexCompileFeatures main.cpp)
set_property(TARGET GenexCompileFeatures
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX11-result.txt b/Tests/RunCMake/CompileFeatures/RequireCXX11-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX11-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX11-stderr.txt b/Tests/RunCMake/CompileFeatures/RequireCXX11-stderr.txt
deleted file mode 100644
index 0fc9112..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX11-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-CMake Error in CMakeLists.txt:
- Target "foo" requires the language dialect "CXX11" , but CMake does not
- know the compile flags to use to enable it.
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX11.cmake b/Tests/RunCMake/CompileFeatures/RequireCXX11.cmake
deleted file mode 100644
index 10b251a..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX11.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-
-add_library(foo empty.cpp)
-set_property(TARGET foo PROPERTY CXX_STANDARD 11)
-set_property(TARGET foo PROPERTY CXX_STANDARD_REQUIRED TRUE)
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX11Ext-result.txt b/Tests/RunCMake/CompileFeatures/RequireCXX11Ext-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX11Ext-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX11Ext-stderr.txt b/Tests/RunCMake/CompileFeatures/RequireCXX11Ext-stderr.txt
deleted file mode 100644
index 5c68a1c..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX11Ext-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-CMake Error in CMakeLists.txt:
- Target "foo" requires the language dialect "CXX11" \(with compiler
- extensions\), but CMake does not know the compile flags to use to enable it.
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX11Ext.cmake b/Tests/RunCMake/CompileFeatures/RequireCXX11Ext.cmake
deleted file mode 100644
index 9e726c8..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX11Ext.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-
-add_library(foo empty.cpp)
-set_property(TARGET foo PROPERTY CXX_STANDARD 11)
-set_property(TARGET foo PROPERTY CXX_EXTENSIONS TRUE)
-set_property(TARGET foo PROPERTY CXX_STANDARD_REQUIRED TRUE)
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX11ExtVariable-result.txt b/Tests/RunCMake/CompileFeatures/RequireCXX11ExtVariable-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX11ExtVariable-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX11ExtVariable-stderr.txt b/Tests/RunCMake/CompileFeatures/RequireCXX11ExtVariable-stderr.txt
deleted file mode 100644
index 5c68a1c..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX11ExtVariable-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-CMake Error in CMakeLists.txt:
- Target "foo" requires the language dialect "CXX11" \(with compiler
- extensions\), but CMake does not know the compile flags to use to enable it.
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX11ExtVariable.cmake b/Tests/RunCMake/CompileFeatures/RequireCXX11ExtVariable.cmake
deleted file mode 100644
index 8f6755f..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX11ExtVariable.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-
-set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
-add_library(foo empty.cpp)
-set_property(TARGET foo PROPERTY CXX_STANDARD 11)
-set_property(TARGET foo PROPERTY CXX_EXTENSIONS TRUE)
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX11Variable-result.txt b/Tests/RunCMake/CompileFeatures/RequireCXX11Variable-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX11Variable-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX11Variable-stderr.txt b/Tests/RunCMake/CompileFeatures/RequireCXX11Variable-stderr.txt
deleted file mode 100644
index 0fc9112..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX11Variable-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-CMake Error in CMakeLists.txt:
- Target "foo" requires the language dialect "CXX11" , but CMake does not
- know the compile flags to use to enable it.
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX11Variable.cmake b/Tests/RunCMake/CompileFeatures/RequireCXX11Variable.cmake
deleted file mode 100644
index 29703db..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX11Variable.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-
-set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
-add_library(foo empty.cpp)
-set_property(TARGET foo PROPERTY CXX_STANDARD 11)
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX98-result.txt b/Tests/RunCMake/CompileFeatures/RequireCXX98-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX98-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX98-stderr.txt b/Tests/RunCMake/CompileFeatures/RequireCXX98-stderr.txt
deleted file mode 100644
index 47c8688..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX98-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-CMake Error in CMakeLists.txt:
- Target "foo" requires the language dialect "CXX98" , but CMake does not
- know the compile flags to use to enable it.
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX98.cmake b/Tests/RunCMake/CompileFeatures/RequireCXX98.cmake
deleted file mode 100644
index 4ea595e..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX98.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-
-add_library(foo empty.cpp)
-set_property(TARGET foo PROPERTY CXX_STANDARD 98)
-set_property(TARGET foo PROPERTY CXX_STANDARD_REQUIRED TRUE)
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX98Ext-result.txt b/Tests/RunCMake/CompileFeatures/RequireCXX98Ext-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX98Ext-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX98Ext-stderr.txt b/Tests/RunCMake/CompileFeatures/RequireCXX98Ext-stderr.txt
deleted file mode 100644
index b4fdf8a..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX98Ext-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-CMake Error in CMakeLists.txt:
- Target "foo" requires the language dialect "CXX98" \(with compiler
- extensions\), but CMake does not know the compile flags to use to enable it.
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX98Ext.cmake b/Tests/RunCMake/CompileFeatures/RequireCXX98Ext.cmake
deleted file mode 100644
index fdf4cc7..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX98Ext.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-
-add_library(foo empty.cpp)
-set_property(TARGET foo PROPERTY CXX_STANDARD 98)
-set_property(TARGET foo PROPERTY CXX_EXTENSIONS TRUE)
-set_property(TARGET foo PROPERTY CXX_STANDARD_REQUIRED TRUE)
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX98ExtVariable-result.txt b/Tests/RunCMake/CompileFeatures/RequireCXX98ExtVariable-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX98ExtVariable-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX98ExtVariable-stderr.txt b/Tests/RunCMake/CompileFeatures/RequireCXX98ExtVariable-stderr.txt
deleted file mode 100644
index b4fdf8a..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX98ExtVariable-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-CMake Error in CMakeLists.txt:
- Target "foo" requires the language dialect "CXX98" \(with compiler
- extensions\), but CMake does not know the compile flags to use to enable it.
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX98ExtVariable.cmake b/Tests/RunCMake/CompileFeatures/RequireCXX98ExtVariable.cmake
deleted file mode 100644
index a26a22d..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX98ExtVariable.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-
-set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
-add_library(foo empty.cpp)
-set_property(TARGET foo PROPERTY CXX_STANDARD 98)
-set_property(TARGET foo PROPERTY CXX_EXTENSIONS TRUE)
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX98Variable-result.txt b/Tests/RunCMake/CompileFeatures/RequireCXX98Variable-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX98Variable-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX98Variable-stderr.txt b/Tests/RunCMake/CompileFeatures/RequireCXX98Variable-stderr.txt
deleted file mode 100644
index 47c8688..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX98Variable-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-CMake Error in CMakeLists.txt:
- Target "foo" requires the language dialect "CXX98" , but CMake does not
- know the compile flags to use to enable it.
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX98Variable.cmake b/Tests/RunCMake/CompileFeatures/RequireCXX98Variable.cmake
deleted file mode 100644
index 0e3ef8d..0000000
--- a/Tests/RunCMake/CompileFeatures/RequireCXX98Variable.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-
-set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
-add_library(foo empty.cpp)
-set_property(TARGET foo PROPERTY CXX_STANDARD 98)
diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
index f083751..43d4cb3 100644
--- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
@@ -18,18 +18,3 @@ if (NOT FEATURES)
run_cmake(NoSupportedCxxFeatures)
run_cmake(NoSupportedCxxFeaturesGenex)
endif()
-
-foreach(standard 98 11)
- file(READ
- "${RunCMake_BINARY_DIR}/generate_feature_list-build/cxx${standard}_flag.txt"
- CXX${standard}_FLAG
- )
- if (CXX${standard}_FLAG STREQUAL NOTFOUND)
- run_cmake(RequireCXX${standard})
- run_cmake(RequireCXX${standard}Variable)
- endif()
- if (CXX${standard}EXT_FLAG STREQUAL NOTFOUND)
- run_cmake(RequireCXX${standard}Ext)
- run_cmake(RequireCXX${standard}ExtVariable)
- endif()
-endforeach()
diff --git a/Tests/RunCMake/CompileFeatures/generate_feature_list.cmake b/Tests/RunCMake/CompileFeatures/generate_feature_list.cmake
index 06c4f73..2bbbd17 100644
--- a/Tests/RunCMake/CompileFeatures/generate_feature_list.cmake
+++ b/Tests/RunCMake/CompileFeatures/generate_feature_list.cmake
@@ -2,22 +2,3 @@
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/features.txt"
"${CMAKE_CXX_COMPILE_FEATURES}"
)
-
-foreach(standard 98 11)
- set(CXX${standard}_FLAG NOTFOUND)
- if (DEFINED CMAKE_CXX${standard}_STANDARD_COMPILE_OPTION)
- set(CXX${standard}_FLAG ${CMAKE_CXX${standard}_STANDARD_COMPILE_OPTION})
- endif()
-
- file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cxx${standard}_flag.txt"
- "${CXX${standard}_FLAG}"
- )
- set(CXX${standard}EXT_FLAG NOTFOUND)
- if (DEFINED CMAKE_CXX${standard}_EXTENSION_COMPILE_OPTION)
- set(CXX${standard}EXT_FLAG ${CMAKE_CXX${standard}_EXTENSION_COMPILE_OPTION})
- endif()
-
- file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cxx${standard}ext_flag.txt"
- "${CXX${standard}EXT_FLAG}"
- )
-endforeach()
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-properties.7.rst | 1 -
Help/manual/cmake-variables.7.rst | 1 -
Help/prop_tgt/CXX_STANDARD.rst | 17 +----
Help/prop_tgt/CXX_STANDARD_REQUIRED.rst | 14 -----
Help/variable/CMAKE_CXX_STANDARD_REQUIRED.rst | 8 ---
Modules/Compiler/GNU-CXX.cmake | 2 -
Source/cmLocalGenerator.cxx | 66 ++------------------
Source/cmTarget.cxx | 1 -
Tests/CompileFeatures/CMakeLists.txt | 3 -
.../CompileFeatures/RequireCXX11-result.txt | 1 -
.../CompileFeatures/RequireCXX11-stderr.txt | 3 -
Tests/RunCMake/CompileFeatures/RequireCXX11.cmake | 4 --
.../CompileFeatures/RequireCXX11Ext-result.txt | 1 -
.../CompileFeatures/RequireCXX11Ext-stderr.txt | 3 -
.../RunCMake/CompileFeatures/RequireCXX11Ext.cmake | 5 --
.../RequireCXX11ExtVariable-result.txt | 1 -
.../RequireCXX11ExtVariable-stderr.txt | 3 -
.../CompileFeatures/RequireCXX11ExtVariable.cmake | 5 --
.../RequireCXX11Variable-result.txt | 1 -
.../RequireCXX11Variable-stderr.txt | 3 -
.../CompileFeatures/RequireCXX11Variable.cmake | 4 --
.../CompileFeatures/RequireCXX98-result.txt | 1 -
.../CompileFeatures/RequireCXX98-stderr.txt | 3 -
Tests/RunCMake/CompileFeatures/RequireCXX98.cmake | 4 --
.../CompileFeatures/RequireCXX98Ext-result.txt | 1 -
.../CompileFeatures/RequireCXX98Ext-stderr.txt | 3 -
.../RunCMake/CompileFeatures/RequireCXX98Ext.cmake | 5 --
.../RequireCXX98ExtVariable-result.txt | 1 -
.../RequireCXX98ExtVariable-stderr.txt | 3 -
.../CompileFeatures/RequireCXX98ExtVariable.cmake | 5 --
.../RequireCXX98Variable-result.txt | 1 -
.../RequireCXX98Variable-stderr.txt | 3 -
.../CompileFeatures/RequireCXX98Variable.cmake | 4 --
Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake | 15 -----
.../CompileFeatures/generate_feature_list.cmake | 19 ------
35 files changed, 8 insertions(+), 207 deletions(-)
delete mode 100644 Help/prop_tgt/CXX_STANDARD_REQUIRED.rst
delete mode 100644 Help/variable/CMAKE_CXX_STANDARD_REQUIRED.rst
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX11-result.txt
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX11-stderr.txt
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX11.cmake
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX11Ext-result.txt
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX11Ext-stderr.txt
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX11Ext.cmake
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX11ExtVariable-result.txt
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX11ExtVariable-stderr.txt
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX11ExtVariable.cmake
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX11Variable-result.txt
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX11Variable-stderr.txt
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX11Variable.cmake
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX98-result.txt
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX98-stderr.txt
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX98.cmake
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX98Ext-result.txt
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX98Ext-stderr.txt
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX98Ext.cmake
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX98ExtVariable-result.txt
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX98ExtVariable-stderr.txt
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX98ExtVariable.cmake
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX98Variable-result.txt
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX98Variable-stderr.txt
delete mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX98Variable.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list