[Cmake-commits] CMake branch, next, updated. v3.2.2-1826-gbdf9ea9
Brad King
brad.king at kitware.com
Wed Apr 15 09:12:28 EDT 2015
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 bdf9ea9180d2b1cb86d8a883120497cbc6104a2d (commit)
via 85c2626babf40d704f133fe49506d25f0a674b5f (commit)
from 8f354a97a5e7745870b8e3b540999d47b994f239 (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=bdf9ea9180d2b1cb86d8a883120497cbc6104a2d
commit bdf9ea9180d2b1cb86d8a883120497cbc6104a2d
Merge: 8f354a9 85c2626
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 15 09:12:26 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 15 09:12:26 2015 -0400
Merge topic 'vs6-deprecate' into next
85c2626b Deprecate Visual Studio 6 generator
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85c2626babf40d704f133fe49506d25f0a674b5f
commit 85c2626babf40d704f133fe49506d25f0a674b5f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 14 15:48:34 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 15 09:08:57 2015 -0400
Deprecate Visual Studio 6 generator
Update documentation to mark the generator deprecated. Add a warning at
the end of generation plus an option to turn off the warning.
diff --git a/Help/generator/Visual Studio 6.rst b/Help/generator/Visual Studio 6.rst
index d619354..855589c 100644
--- a/Help/generator/Visual Studio 6.rst
+++ b/Help/generator/Visual Studio 6.rst
@@ -1,4 +1,10 @@
Visual Studio 6
---------------
-Generates Visual Studio 6 project files.
+Deprected. Generates Visual Studio 6 project files.
+
+.. note::
+ This generator is deprecated and will be removed
+ in a future version of CMake. It will still be
+ possible to build with VS 6 tools using the
+ :generator:`NMake Makefiles` generator.
diff --git a/Help/release/dev/vs6-deprecate.rst b/Help/release/dev/vs6-deprecate.rst
new file mode 100644
index 0000000..83f9afb
--- /dev/null
+++ b/Help/release/dev/vs6-deprecate.rst
@@ -0,0 +1,5 @@
+vs6-deprecate
+-------------
+
+* The :generator:`Visual Studio 6` generator is now deprecated
+ and will be removed in a future version of CMake.
diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index 62a308e..e2b2bbd 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -185,6 +185,22 @@ void cmGlobalVisualStudio6Generator::Generate()
// Now write out the DSW
this->OutputDSWFile();
+
+ if (!this->CMakeInstance->GetIsInTryCompile())
+ {
+ const char* cmakeWarnVS6 =
+ this->CMakeInstance->GetState()->GetCacheEntryValue("CMAKE_WARN_VS6");
+ if (!cmakeWarnVS6 || !cmSystemTools::IsOff(cmakeWarnVS6))
+ {
+ this->CMakeInstance->IssueMessage(
+ cmake::WARNING,
+ "The \"Visual Studio 6\" generator is deprecated "
+ "and will be removed in a future version of CMake."
+ "\n"
+ "Add CMAKE_WARN_VS6=OFF to the cache to disable this warning."
+ );
+ }
+ }
}
// Write a DSW file to the stream
@@ -411,7 +427,7 @@ void cmGlobalVisualStudio6Generator
::GetDocumentation(cmDocumentationEntry& entry)
{
entry.Name = cmGlobalVisualStudio6Generator::GetActualName();
- entry.Brief = "Generates Visual Studio 6 project files.";
+ entry.Brief = "Deprecated. Generates Visual Studio 6 project files.";
}
//----------------------------------------------------------------------------
diff --git a/Tests/RunCMake/CommandLine/DeprecateVS6-WARN-OFF.cmake b/Tests/RunCMake/CommandLine/DeprecateVS6-WARN-OFF.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/CommandLine/DeprecateVS6-WARN-ON-stderr.txt b/Tests/RunCMake/CommandLine/DeprecateVS6-WARN-ON-stderr.txt
new file mode 100644
index 0000000..1b6a510
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/DeprecateVS6-WARN-ON-stderr.txt
@@ -0,0 +1,5 @@
+^CMake Warning:
+ The "Visual Studio 6" generator is deprecated and will be removed in a
+ future version of CMake.
+
+ Add CMAKE_WARN_VS6=OFF to the cache to disable this warning.$
diff --git a/Tests/RunCMake/CommandLine/DeprecateVS6-WARN-ON.cmake b/Tests/RunCMake/CommandLine/DeprecateVS6-WARN-ON.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index f047baf..4242723 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -40,6 +40,13 @@ if(RunCMake_GENERATOR STREQUAL "Ninja")
unset(RunCMake_TEST_NO_CLEAN)
endif()
+if(RunCMake_GENERATOR STREQUAL "Visual Studio 6")
+ set(RunCMake_WARN_VS6 1)
+ run_cmake(DeprecateVS6-WARN-ON)
+ unset(RunCMake_WARN_VS6)
+ run_cmake(DeprecateVS6-WARN-OFF)
+endif()
+
if(UNIX)
run_cmake_command(E_create_symlink-no-arg
${CMAKE_COMMAND} -E create_symlink
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 6333703..e5d3590 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -51,6 +51,9 @@ function(run_cmake test)
if(APPLE)
list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_POLICY_DEFAULT_CMP0025=NEW)
endif()
+ if(RunCMake_GENERATOR STREQUAL "Visual Studio 6" AND NOT RunCMake_WARN_VS6)
+ list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_WARN_VS6=OFF)
+ endif()
if(RunCMake_MAKE_PROGRAM)
list(APPEND RunCMake_TEST_OPTIONS "-DCMAKE_MAKE_PROGRAM=${RunCMake_MAKE_PROGRAM}")
endif()
-----------------------------------------------------------------------
Summary of changes:
Help/generator/Visual Studio 6.rst | 8 +++++++-
Help/release/dev/vs6-deprecate.rst | 5 +++++
Source/cmGlobalVisualStudio6Generator.cxx | 18 +++++++++++++++++-
.../RunCMake/CommandLine/DeprecateVS6-WARN-OFF.cmake | 0
.../CommandLine/DeprecateVS6-WARN-ON-stderr.txt | 5 +++++
.../RunCMake/CommandLine/DeprecateVS6-WARN-ON.cmake | 0
Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 7 +++++++
Tests/RunCMake/RunCMake.cmake | 3 +++
8 files changed, 44 insertions(+), 2 deletions(-)
create mode 100644 Help/release/dev/vs6-deprecate.rst
copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/DeprecateVS6-WARN-OFF.cmake (100%)
create mode 100644 Tests/RunCMake/CommandLine/DeprecateVS6-WARN-ON-stderr.txt
copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/DeprecateVS6-WARN-ON.cmake (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list