[Cmake-commits] CMake branch, next, updated. v3.2.2-1828-g4f72721
Brad King
brad.king at kitware.com
Wed Apr 15 10:03:58 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 4f727215847c810a56770c0cbdd3757663338e88 (commit)
via 7b8e7c4ac3885b9a58ce1c238b045d5580f83c27 (commit)
from bdf9ea9180d2b1cb86d8a883120497cbc6104a2d (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=4f727215847c810a56770c0cbdd3757663338e88
commit 4f727215847c810a56770c0cbdd3757663338e88
Merge: bdf9ea9 7b8e7c4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 15 10:03:56 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 15 10:03:56 2015 -0400
Merge topic 'vs70-deprecate' into next
7b8e7c4a Deprecate Visual Studio 7 generator (.NET 2002)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b8e7c4ac3885b9a58ce1c238b045d5580f83c27
commit 7b8e7c4ac3885b9a58ce1c238b045d5580f83c27
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 15 09:20:12 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 15 09:21:24 2015 -0400
Deprecate Visual Studio 7 generator (.NET 2002)
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 7.rst b/Help/generator/Visual Studio 7.rst
index d0eb719..eb426f4 100644
--- a/Help/generator/Visual Studio 7.rst
+++ b/Help/generator/Visual Studio 7.rst
@@ -1,4 +1,10 @@
Visual Studio 7
---------------
-Generates Visual Studio .NET 2002 project files.
+Deprected. Generates Visual Studio .NET 2002 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 7.0 tools using the
+ :generator:`NMake Makefiles` generator.
diff --git a/Help/release/dev/vs70-deprecate.rst b/Help/release/dev/vs70-deprecate.rst
new file mode 100644
index 0000000..fb94110
--- /dev/null
+++ b/Help/release/dev/vs70-deprecate.rst
@@ -0,0 +1,5 @@
+vs70-deprecate
+--------------
+
+* The :generator:`Visual Studio 7` generator (.NET 2002) is now
+ deprecated and will be removed in a future version of CMake.
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 6a3a145..0d7dfd7 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -351,6 +351,23 @@ void cmGlobalVisualStudio7Generator::Generate()
{
this->CallVisualStudioMacro(MacroReload);
}
+
+ if (!this->CMakeInstance->GetIsInTryCompile() &&
+ this->GetName() == "Visual Studio 7")
+ {
+ const char* cmakeWarnVS70 =
+ this->CMakeInstance->GetState()->GetCacheEntryValue("CMAKE_WARN_VS70");
+ if (!cmakeWarnVS70 || !cmSystemTools::IsOff(cmakeWarnVS70))
+ {
+ this->CMakeInstance->IssueMessage(
+ cmake::WARNING,
+ "The \"Visual Studio 7\" generator is deprecated "
+ "and will be removed in a future version of CMake."
+ "\n"
+ "Add CMAKE_WARN_VS70=OFF to the cache to disable this warning."
+ );
+ }
+ }
}
void cmGlobalVisualStudio7Generator
@@ -983,7 +1000,7 @@ void cmGlobalVisualStudio7Generator
::GetDocumentation(cmDocumentationEntry& entry)
{
entry.Name = cmGlobalVisualStudio7Generator::GetActualName();
- entry.Brief = "Generates Visual Studio .NET 2002 project files.";
+ entry.Brief = "Deprecated. Generates Visual Studio .NET 2002 project files.";
}
//----------------------------------------------------------------------------
diff --git a/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-OFF.cmake b/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-OFF.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON-stderr.txt b/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON-stderr.txt
new file mode 100644
index 0000000..ea31ef3
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON-stderr.txt
@@ -0,0 +1,5 @@
+^CMake Warning:
+ The "Visual Studio 7" generator is deprecated and will be removed in a
+ future version of CMake.
+
+ Add CMAKE_WARN_VS70=OFF to the cache to disable this warning.$
diff --git a/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON.cmake b/Tests/RunCMake/CommandLine/DeprecateVS70-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 4242723..644e5ae 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -45,6 +45,11 @@ if(RunCMake_GENERATOR STREQUAL "Visual Studio 6")
run_cmake(DeprecateVS6-WARN-ON)
unset(RunCMake_WARN_VS6)
run_cmake(DeprecateVS6-WARN-OFF)
+elseif(RunCMake_GENERATOR STREQUAL "Visual Studio 7")
+ set(RunCMake_WARN_VS70 1)
+ run_cmake(DeprecateVS70-WARN-ON)
+ unset(RunCMake_WARN_VS70)
+ run_cmake(DeprecateVS70-WARN-OFF)
endif()
if(UNIX)
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index e5d3590..b24ae0b 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -54,6 +54,9 @@ function(run_cmake test)
if(RunCMake_GENERATOR STREQUAL "Visual Studio 6" AND NOT RunCMake_WARN_VS6)
list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_WARN_VS6=OFF)
endif()
+ if(RunCMake_GENERATOR STREQUAL "Visual Studio 7" AND NOT RunCMake_WARN_VS70)
+ list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_WARN_VS70=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 7.rst | 8 +++++++-
Help/release/dev/vs70-deprecate.rst | 5 +++++
Source/cmGlobalVisualStudio7Generator.cxx | 19 ++++++++++++++++++-
.../CommandLine/DeprecateVS70-WARN-OFF.cmake | 0
.../CommandLine/DeprecateVS70-WARN-ON-stderr.txt | 5 +++++
.../CommandLine/DeprecateVS70-WARN-ON.cmake | 0
Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 5 +++++
Tests/RunCMake/RunCMake.cmake | 3 +++
8 files changed, 43 insertions(+), 2 deletions(-)
create mode 100644 Help/release/dev/vs70-deprecate.rst
copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/DeprecateVS70-WARN-OFF.cmake (100%)
create mode 100644 Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON-stderr.txt
copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON.cmake (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list