[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2815-geca5f7d
Stephen Kelly
steveire at gmail.com
Tue May 6 14:44:14 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 eca5f7d429835e55d1bd57b0d22b4ea648bc3733 (commit)
via 67fc928092b2d9b5a97d4e4ec27d246910586ad5 (commit)
from c09314ad87da2d297fb99184583f69c5ac9d56c0 (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=eca5f7d429835e55d1bd57b0d22b4ea648bc3733
commit eca5f7d429835e55d1bd57b0d22b4ea648bc3733
Merge: c09314a 67fc928
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 14:44:13 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 6 14:44:13 2014 -0400
Merge topic 'decay-language-version' into next
67fc9280 Add tests.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67fc928092b2d9b5a97d4e4ec27d246910586ad5
commit 67fc928092b2d9b5a97d4e4ec27d246910586ad5
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 20:23:48 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue May 6 20:43:46 2014 +0200
Add tests.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ee6cb44..3436bb4 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -315,6 +315,7 @@ 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/RunCMake/CompileFeatures/RequireCXX11.cmake b/Tests/RunCMake/CompileFeatures/RequireCXX11.cmake
index 01d3e71..10b251a 100644
--- a/Tests/RunCMake/CompileFeatures/RequireCXX11.cmake
+++ b/Tests/RunCMake/CompileFeatures/RequireCXX11.cmake
@@ -1,9 +1,4 @@
-foreach(standard 98 11)
- unset(CMAKE_CXX${standard}_STANDARD_COMPILE_OPTION)
- unset(CMAKE_CXX${standard}_EXTENSION_COMPILE_OPTION)
-endforeach()
-
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/RequireCXX11ExtVariable-result.txt b/Tests/RunCMake/CompileFeatures/RequireCXX11ExtVariable-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/RequireCXX11ExtVariable-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX11ExtVariable-stderr.txt b/Tests/RunCMake/CompileFeatures/RequireCXX11ExtVariable-stderr.txt
new file mode 100644
index 0000000..5c68a1c
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/RequireCXX11ExtVariable-stderr.txt
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..8f6755f
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/RequireCXX11ExtVariable.cmake
@@ -0,0 +1,5 @@
+
+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
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/RequireCXX11Variable-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX11Variable-stderr.txt b/Tests/RunCMake/CompileFeatures/RequireCXX11Variable-stderr.txt
new file mode 100644
index 0000000..0fc9112
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/RequireCXX11Variable-stderr.txt
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..29703db
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/RequireCXX11Variable.cmake
@@ -0,0 +1,4 @@
+
+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/RequireCXX98ExtVariable-result.txt b/Tests/RunCMake/CompileFeatures/RequireCXX98ExtVariable-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/RequireCXX98ExtVariable-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX98ExtVariable-stderr.txt b/Tests/RunCMake/CompileFeatures/RequireCXX98ExtVariable-stderr.txt
new file mode 100644
index 0000000..b4fdf8a
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/RequireCXX98ExtVariable-stderr.txt
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..a26a22d
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/RequireCXX98ExtVariable.cmake
@@ -0,0 +1,5 @@
+
+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
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/RequireCXX98Variable-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CompileFeatures/RequireCXX98Variable-stderr.txt b/Tests/RunCMake/CompileFeatures/RequireCXX98Variable-stderr.txt
new file mode 100644
index 0000000..47c8688
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/RequireCXX98Variable-stderr.txt
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..1e6fc15
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/RequireCXX98Variable.cmake
@@ -0,0 +1,4 @@
+
+set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
+add_library(bar empty.cpp)
+set_property(TARGET bar PROPERTY CXX_STANDARD 98)
diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
index 50c7269..f083751 100644
--- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
@@ -26,8 +26,10 @@ foreach(standard 98 11)
)
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()
-----------------------------------------------------------------------
Summary of changes:
Source/cmTarget.cxx | 1 +
Tests/RunCMake/CompileFeatures/RequireCXX11.cmake | 5 -----
.../RequireCXX11ExtVariable-result.txt} | 0
...uireCXX11Ext-stderr.txt => RequireCXX11ExtVariable-stderr.txt} | 0
.../{RequireCXX11Ext.cmake => RequireCXX11ExtVariable.cmake} | 2 +-
.../RequireCXX11Variable-result.txt} | 0
.../{RequireCXX11-stderr.txt => RequireCXX11Variable-stderr.txt} | 0
Tests/RunCMake/CompileFeatures/RequireCXX11Variable.cmake | 4 ++++
.../RequireCXX98ExtVariable-result.txt} | 0
...uireCXX98Ext-stderr.txt => RequireCXX98ExtVariable-stderr.txt} | 0
.../{RequireCXX98Ext.cmake => RequireCXX98ExtVariable.cmake} | 2 +-
.../RequireCXX98Variable-result.txt} | 0
.../{RequireCXX98-stderr.txt => RequireCXX98Variable-stderr.txt} | 0
Tests/RunCMake/CompileFeatures/RequireCXX98Variable.cmake | 4 ++++
Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake | 2 ++
15 files changed, 13 insertions(+), 7 deletions(-)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CompileFeatures/RequireCXX11ExtVariable-result.txt} (100%)
copy Tests/RunCMake/CompileFeatures/{RequireCXX11Ext-stderr.txt => RequireCXX11ExtVariable-stderr.txt} (100%)
copy Tests/RunCMake/CompileFeatures/{RequireCXX11Ext.cmake => RequireCXX11ExtVariable.cmake} (68%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CompileFeatures/RequireCXX11Variable-result.txt} (100%)
copy Tests/RunCMake/CompileFeatures/{RequireCXX11-stderr.txt => RequireCXX11Variable-stderr.txt} (100%)
create mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX11Variable.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CompileFeatures/RequireCXX98ExtVariable-result.txt} (100%)
copy Tests/RunCMake/CompileFeatures/{RequireCXX98Ext-stderr.txt => RequireCXX98ExtVariable-stderr.txt} (100%)
copy Tests/RunCMake/CompileFeatures/{RequireCXX98Ext.cmake => RequireCXX98ExtVariable.cmake} (68%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CompileFeatures/RequireCXX98Variable-result.txt} (100%)
copy Tests/RunCMake/CompileFeatures/{RequireCXX98-stderr.txt => RequireCXX98Variable-stderr.txt} (100%)
create mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX98Variable.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list