[Cmake-commits] CMake branch, next, updated. v3.5.2-1138-g50a5d0c
Brad King
brad.king at kitware.com
Thu Apr 28 11:51:06 EDT 2016
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 50a5d0c74c094c0030478190ed0c7c041f773500 (commit)
via ce82e0a53f4064693c14ce97a5efb3e38efc3fa7 (commit)
via 6a501b6519850c0dd2bcc687cd8da6fc6c9459d5 (commit)
from 44bcbc8cc56fa194cc9a2d15bd3edf6dd0090a4a (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50a5d0c74c094c0030478190ed0c7c041f773500
commit 50a5d0c74c094c0030478190ed0c7c041f773500
Merge: 44bcbc8 ce82e0a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 28 11:51:05 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 28 11:51:05 2016 -0400
Merge topic 'vs71-deprecate' into next
ce82e0a5 Deprecate Visual Studio 7 .NET 2003 generator
6a501b65 Tests: Drop test for VS 7.0 generator deprecation warnings
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce82e0a53f4064693c14ce97a5efb3e38efc3fa7
commit ce82e0a53f4064693c14ce97a5efb3e38efc3fa7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 28 10:09:15 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 28 10:09:20 2016 -0400
Deprecate Visual Studio 7 .NET 2003 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 7 .NET 2003.rst b/Help/generator/Visual Studio 7 .NET 2003.rst
index 2034140..1c086a0 100644
--- a/Help/generator/Visual Studio 7 .NET 2003.rst
+++ b/Help/generator/Visual Studio 7 .NET 2003.rst
@@ -1,4 +1,10 @@
Visual Studio 7 .NET 2003
-------------------------
-Generates Visual Studio .NET 2003 project files.
+Deprecated. Generates Visual Studio .NET 2003 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.1 tools using the
+ :generator:`NMake Makefiles` generator.
diff --git a/Help/release/dev/vs71-deprecate.rst b/Help/release/dev/vs71-deprecate.rst
new file mode 100644
index 0000000..1946304
--- /dev/null
+++ b/Help/release/dev/vs71-deprecate.rst
@@ -0,0 +1,5 @@
+vs71-deprecate
+--------------
+
+* The :generator:`Visual Studio 7 .NET 2003` generator is now
+ deprecated and will be removed in a future version of CMake.
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 7b51fdf..dd1f2e4 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -325,5 +325,5 @@ void cmGlobalVisualStudio71Generator
::GetDocumentation(cmDocumentationEntry& entry)
{
entry.Name = cmGlobalVisualStudio71Generator::GetActualName();
- entry.Brief = "Generates Visual Studio .NET 2003 project files.";
+ entry.Brief = "Deprecated. Generates Visual Studio .NET 2003 project files.";
}
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index c1c8c77..ba498ef 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -335,6 +335,23 @@ void cmGlobalVisualStudio7Generator::Generate()
{
this->CallVisualStudioMacro(MacroReload);
}
+
+ if (this->Version == VS71 &&
+ !this->CMakeInstance->GetIsInTryCompile())
+ {
+ const char* cmakeWarnVS71 =
+ this->CMakeInstance->GetState()->GetCacheEntryValue("CMAKE_WARN_VS71");
+ if (!cmakeWarnVS71 || !cmSystemTools::IsOff(cmakeWarnVS71))
+ {
+ this->CMakeInstance->IssueMessage(
+ cmake::WARNING,
+ "The \"Visual Studio 7 .NET 2003\" generator is deprecated "
+ "and will be removed in a future version of CMake."
+ "\n"
+ "Add CMAKE_WARN_VS71=OFF to the cache to disable this warning."
+ );
+ }
+ }
}
void cmGlobalVisualStudio7Generator
diff --git a/Tests/RunCMake/CommandLine/DeprecateVS71-WARN-OFF.cmake b/Tests/RunCMake/CommandLine/DeprecateVS71-WARN-OFF.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/CommandLine/DeprecateVS71-WARN-ON-stderr.txt b/Tests/RunCMake/CommandLine/DeprecateVS71-WARN-ON-stderr.txt
new file mode 100644
index 0000000..2cb01ff
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/DeprecateVS71-WARN-ON-stderr.txt
@@ -0,0 +1,5 @@
+^CMake Warning:
+ The "Visual Studio 7 .NET 2003" generator is deprecated and will be removed
+ in a future version of CMake.
+
+ Add CMAKE_WARN_VS71=OFF to the cache to disable this warning.$
diff --git a/Tests/RunCMake/CommandLine/DeprecateVS71-WARN-ON.cmake b/Tests/RunCMake/CommandLine/DeprecateVS71-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 7e26ce7..f449f1d 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -72,6 +72,13 @@ if(RunCMake_GENERATOR STREQUAL "Ninja")
unset(RunCMake_TEST_NO_CLEAN)
endif()
+if(RunCMake_GENERATOR STREQUAL "Visual Studio 7 .NET 2003")
+ set(RunCMake_WARN_VS71 1)
+ run_cmake(DeprecateVS71-WARN-ON)
+ unset(RunCMake_WARN_VS71)
+ run_cmake(DeprecateVS71-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 736faf1..fa0c980 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 7 .NET 2003" AND NOT RunCMake_WARN_VS71)
+ list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_WARN_VS71=OFF)
+ endif()
if(RunCMake_MAKE_PROGRAM)
list(APPEND RunCMake_TEST_OPTIONS "-DCMAKE_MAKE_PROGRAM=${RunCMake_MAKE_PROGRAM}")
endif()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a501b6519850c0dd2bcc687cd8da6fc6c9459d5
commit 6a501b6519850c0dd2bcc687cd8da6fc6c9459d5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 28 10:03:07 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 28 10:04:09 2016 -0400
Tests: Drop test for VS 7.0 generator deprecation warnings
We removed this generator but forgot to remove this now-unused test
case.
diff --git a/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-OFF.cmake b/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-OFF.cmake
deleted file mode 100644
index e69de29..0000000
diff --git a/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON-stderr.txt b/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON-stderr.txt
deleted file mode 100644
index ea31ef3..0000000
--- a/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON-stderr.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-^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
deleted file mode 100644
index e69de29..0000000
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index 3b5504e..7e26ce7 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -72,13 +72,6 @@ if(RunCMake_GENERATOR STREQUAL "Ninja")
unset(RunCMake_TEST_NO_CLEAN)
endif()
-if(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)
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 9d44a8a..736faf1 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -51,9 +51,6 @@ function(run_cmake test)
if(APPLE)
list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_POLICY_DEFAULT_CMP0025=NEW)
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 .NET 2003.rst | 8 +++++++-
Help/release/dev/vs71-deprecate.rst | 5 +++++
Source/cmGlobalVisualStudio71Generator.cxx | 2 +-
Source/cmGlobalVisualStudio7Generator.cxx | 17 +++++++++++++++++
.../CommandLine/DeprecateVS70-WARN-ON-stderr.txt | 5 -----
...70-WARN-OFF.cmake => DeprecateVS71-WARN-OFF.cmake} | 0
.../CommandLine/DeprecateVS71-WARN-ON-stderr.txt | 5 +++++
...VS70-WARN-ON.cmake => DeprecateVS71-WARN-ON.cmake} | 0
Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 10 +++++-----
Tests/RunCMake/RunCMake.cmake | 4 ++--
10 files changed, 42 insertions(+), 14 deletions(-)
create mode 100644 Help/release/dev/vs71-deprecate.rst
delete mode 100644 Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON-stderr.txt
rename Tests/RunCMake/CommandLine/{DeprecateVS70-WARN-OFF.cmake => DeprecateVS71-WARN-OFF.cmake} (100%)
create mode 100644 Tests/RunCMake/CommandLine/DeprecateVS71-WARN-ON-stderr.txt
rename Tests/RunCMake/CommandLine/{DeprecateVS70-WARN-ON.cmake => DeprecateVS71-WARN-ON.cmake} (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list