echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop Visual Studio 7 .NET 2003 generator

Browse Source 
This generator has been deprecated since CMake 3.6.  Remove it.
This commit is contained in:
Brad King 2017-04-19 15:00:57 -04:00
parent a4452fd82d
commit c94f1bcf92
39 changed files with 45 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CompileFlags.cmake
View File

@ -4,10 +4,6 @@
#-----------------------------------------------------------------------------
# set some special flags for different compilers
#
if(CMAKE_GENERATOR MATCHES "Visual Studio 7")
set(CMAKE_SKIP_COMPATIBILITY_TESTS 1)
endif()
if(WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "Intel")
set(_INTEL_WINDOWS 1)
endif()

2
Help/command/add_custom_command.rst
View File

@ -215,7 +215,7 @@ of the following is specified:
``PRE_BUILD``
Run before any other rules are executed within the target.
This is supported only on Visual Studio 7 or later.
This is supported only on Visual Studio 8 or later.
For all other generators ``PRE_BUILD`` will be treated as
``PRE_LINK``.
``PRE_LINK``

10
Help/generator/Visual Studio 7 .NET 2003.rst
View File

@ -1,10 +1,6 @@
Visual Studio 7 .NET 2003
-------------------------
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.
Removed. This once generated Visual Studio .NET 2003 project files, but
the generator has been removed since CMake 3.9. It is still possible to
build with VS 7.1 tools using the :generator:`NMake Makefiles` generator.

2
Help/prop_dir/VS_GLOBAL_SECTION_POST_section.rst
View File

@ -17,7 +17,7 @@ pairs. Each such pair will be transformed into an entry in the
solution global section. Whitespace around key and value is ignored.
List elements which do not contain an equal sign are skipped.
This property only works for Visual Studio 7 and above; it is ignored
This property only works for Visual Studio 8 and above; it is ignored
on other generators. The property only applies when set on a
directory whose CMakeLists.txt contains a project() command.

2
Help/prop_dir/VS_GLOBAL_SECTION_PRE_section.rst
View File

@ -17,6 +17,6 @@ pairs. Each such pair will be transformed into an entry in the
solution global section. Whitespace around key and value is ignored.
List elements which do not contain an equal sign are skipped.
This property only works for Visual Studio 7 and above; it is ignored
This property only works for Visual Studio 8 and above; it is ignored
on other generators. The property only applies when set on a
directory whose CMakeLists.txt contains a project() command.

2
Help/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD.rst
View File

@ -3,6 +3,6 @@ EXCLUDE_FROM_DEFAULT_BUILD
Exclude target from "Build Solution".
This property is only used by Visual Studio generators 7 and above.
This property is only used by Visual Studio generators.
When set to TRUE, the target will not be built when you press "Build
Solution".

4
Help/release/dev/remove-vs7.1-generator.rst Normal file
View File

@ -0,0 +1,4 @@
remove-vs7.1-generator
----------------------
* The :generator:`Visual Studio 7 .NET 2003` generator has been removed.

2
Help/variable/CMAKE_CFG_INTDIR.rst
View File

@ -12,7 +12,7 @@ Example values:
::
$(ConfigurationName) = Visual Studio 7, 8, 9
$(ConfigurationName) = Visual Studio 8, 9
$(Configuration) = Visual Studio 10
$(CONFIGURATION) = Xcode
. = Make-based tools

2
Help/variable/CMAKE_MFC_FLAG.rst
View File

@ -5,7 +5,7 @@ Tell cmake to use MFC for an executable or dll.
This can be set in a ``CMakeLists.txt`` file and will enable MFC in the
application. It should be set to ``1`` for the static MFC library, and ``2``
for the shared MFC library. This is used in Visual Studio 7
for the shared MFC library. This is used in Visual Studio
project files. The CMakeSetup dialog used MFC and the ``CMakeLists.txt``
looks like this:

2
Help/variable/CMAKE_VS_DEVENV_COMMAND.rst
View File

@ -1,7 +1,7 @@
CMAKE_VS_DEVENV_COMMAND
-----------------------
The generators for :generator:`Visual Studio 7` and above set this
The generators for :generator:`Visual Studio 8 2005` and above set this
variable to the ``devenv.com`` command installed with the corresponding
Visual Studio version. Note that this variable may be empty on
Visual Studio Express editions because they do not provide this tool.

2
Help/variable/CMAKE_VS_INTEL_Fortran_PROJECT_VERSION.rst
View File

@ -1,7 +1,7 @@
CMAKE_VS_INTEL_Fortran_PROJECT_VERSION
--------------------------------------
When generating for :generator:`Visual Studio 7` or greater with the Intel
When generating for :generator:`Visual Studio 8 2005` or greater with the Intel
Fortran plugin installed, this specifies the ``.vfproj`` project file format
version. This is intended for internal use by CMake and should not be
used by project code.

6
Modules/CMakeBackwardCompatibilityC.cmake
View File

@ -2,12 +2,6 @@
# file Copyright.txt or https://cmake.org/licensing for details.
# Nothing here yet
if(CMAKE_GENERATOR MATCHES "Visual Studio 7")
include(CMakeVS7BackwardCompatibility)
set(CMAKE_SKIP_COMPATIBILITY_TESTS 1)
endif()
if(NOT CMAKE_SKIP_COMPATIBILITY_TESTS)
# Old CMake versions did not support OS X universal binaries anyway,
# so just get through this with at least some size for the types.

2
Modules/CMakeDetermineCSharpCompiler.cmake
View File

@ -1,7 +1,7 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
if(NOT ${CMAKE_GENERATOR} MATCHES "Visual Studio ([^789]|[789][0-9])")
if(NOT ${CMAKE_GENERATOR} MATCHES "Visual Studio ([^89]|[89][0-9])")
message(FATAL_ERROR
"C# is currently only supported for Microsoft Visual Studio 2010 and later.")
endif()

2
Modules/CMakeDetermineCUDACompiler.cmake
View File

@ -6,7 +6,7 @@ include(${CMAKE_ROOT}/Modules//CMakeParseImplicitLinkInfo.cmake)
if( NOT ( ("${CMAKE_GENERATOR}" MATCHES "Make") OR
("${CMAKE_GENERATOR}" MATCHES "Ninja") OR
("${CMAKE_GENERATOR}" MATCHES "Visual Studio (1|[7-9][0-9])") ) )
("${CMAKE_GENERATOR}" MATCHES "Visual Studio (1|[89][0-9])") ) )
message(FATAL_ERROR "CUDA language not currently supported by \"${CMAKE_GENERATOR}\" generator")
endif()

16
Modules/CMakeVS7BackwardCompatibility.cmake
View File

@ -1,16 +0,0 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
# hard code these for fast backwards compatibility tests
set (CMAKE_SIZEOF_INT 4 CACHE INTERNAL "Size of int data type")
set (CMAKE_SIZEOF_LONG 4 CACHE INTERNAL "Size of long data type")
set (CMAKE_SIZEOF_VOID_P 4 CACHE INTERNAL "Size of void* data type")
set (CMAKE_SIZEOF_CHAR 1 CACHE INTERNAL "Size of char data type")
set (CMAKE_SIZEOF_SHORT 2 CACHE INTERNAL "Size of short data type")
set (CMAKE_SIZEOF_FLOAT 4 CACHE INTERNAL "Size of float data type")
set (CMAKE_SIZEOF_DOUBLE 8 CACHE INTERNAL "Size of double data type")
set (CMAKE_NO_ANSI_FOR_SCOPE 0 CACHE INTERNAL
"Does the compiler support ansi for scope.")
set (CMAKE_USE_WIN32_THREADS TRUE CACHE BOOL "Use the win32 thread library.")
set (CMAKE_WORDS_BIGENDIAN 0 CACHE INTERNAL "endianness of bytes")

6
Modules/CTest.cmake
View File

@ -54,15 +54,11 @@ in the ``CTestConfig.cmake`` file.
option(BUILD_TESTING "Build the testing tree." ON)
# function to turn generator name into a version string
# like vs7 vs71 vs8 vs9
# like vs8 vs9
function(GET_VS_VERSION_STRING generator var)
string(REGEX REPLACE "Visual Studio ([0-9][0-9]?)($|.*)" "\\1"
NUMBER "${generator}")
if("${generator}" MATCHES "Visual Studio 7 .NET 2003")
set(ver_string "vs71")
else()
set(ver_string "vs${NUMBER}")
endif()
set(${var} ${ver_string} PARENT_SCOPE)
endfunction()

2
Modules/Platform/Windows-df.cmake
View File

@ -30,7 +30,7 @@ set(CMAKE_Fortran_LINK_EXECUTABLE
set(CMAKE_CREATE_WIN32_EXE /winapp)
set(CMAKE_CREATE_CONSOLE_EXE )
if(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visual Studio 8")
if(CMAKE_GENERATOR MATCHES "Visual Studio 8")
set (CMAKE_NO_BUILD_TYPE 1)
endif()
# does the compiler support pdbtype and is it the newer compiler

2
Source/CPack/OSXScriptLauncher.cxx
View File

@ -85,8 +85,6 @@ int main(int argc, char* argv[])
int length;
while (cmsysProcess_WaitForData(cp, &data, &length, 0)) {
// Translate NULL characters in the output into valid text.
// Visual Studio 7 puts these characters in the output of its
// build process.
for (int i = 0; i < length; ++i) {
if (data[i] == '\0') {
data[i] = ' ';

68
Source/cmGlobalVisualStudio71Generator.cxx
View File

@ -13,58 +13,6 @@ cmGlobalVisualStudio71Generator::cmGlobalVisualStudio71Generator(
: cmGlobalVisualStudio7Generator(cm, platformName)
{
this->ProjectConfigurationSectionName = "ProjectConfiguration";
this->Version = VS71;
}
std::string cmGlobalVisualStudio71Generator::GetUserMacrosDirectory()
{
// Macros not supported on Visual Studio 7.1 and earlier because
// they do not appear to work *during* a build when called by an
// outside agent...
//
return "";
#if 0
//
// The COM result from calling a Visual Studio macro with 7.1 indicates
// that the call succeeds, but the macro does not appear to execute...
//
// So, I am leaving this code here to show how to do it, but have not
// yet figured out what the issue is in terms of why the macro does not
// appear to execute...
//
std::string base;
std::string path;
// base begins with the VisualStudioProjectsLocation reg value...
if (cmSystemTools::ReadRegistryValue(
"HKEY_CURRENT_USER\\Software\\Microsoft\\VisualStudio\\7.1;"
"VisualStudioProjectsLocation",
base))
{
cmSystemTools::ConvertToUnixSlashes(base);
// 7.1 macros folder:
path = base + "/VSMacros71";
}
// path is (correctly) still empty if we did not read the base value from
// the Registry value
return path;
#endif
}
std::string cmGlobalVisualStudio71Generator::GetUserMacrosRegKeyBase()
{
// Macros not supported on Visual Studio 7.1 and earlier because
// they do not appear to work *during* a build when called by an
// outside agent...
//
return "";
#if 0
return "Software\\Microsoft\\VisualStudio\\7.1\\vsmacros";
#endif
}
void cmGlobalVisualStudio71Generator::WriteSLNFile(
@ -91,11 +39,6 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(
std::ostringstream targetsSlnString;
this->WriteTargetsToSolution(targetsSlnString, root, orderedProjectTargets);
// VS 7 does not support folders specified first.
if (this->GetVersion() <= VS71) {
fout << targetsSlnString.str();
}
// Generate folder specification.
bool useFolderProperty = this->UseFolderProperty();
if (useFolderProperty) {
@ -103,9 +46,7 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(
}
// Now write the actual target specification content.
if (this->GetVersion() > VS71) {
fout << targetsSlnString.str();
}
fout << targetsSlnString.str();
// Write out the configurations information for the solution
fout << "Global\n";
@ -280,10 +221,3 @@ void cmGlobalVisualStudio71Generator::WriteSLNHeader(std::ostream& fout)
{
fout << "Microsoft Visual Studio Solution File, Format Version 8.00\n";
}
void cmGlobalVisualStudio71Generator::GetDocumentation(
cmDocumentationEntry& entry)
{
entry.Name = cmGlobalVisualStudio71Generator::GetActualName();
entry.Brief = "Deprecated. Generates Visual Studio .NET 2003 project files.";
}

29
Source/cmGlobalVisualStudio71Generator.h
View File

@ -15,37 +15,8 @@ class cmGlobalVisualStudio71Generator : public cmGlobalVisualStudio7Generator
public:
cmGlobalVisualStudio71Generator(cmake* cm,
const std::string& platformName = "");
static cmGlobalGeneratorFactory* NewFactory()
{
return new cmGlobalGeneratorSimpleFactory<
cmGlobalVisualStudio71Generator>();
}
///! Get the name for the generator.
virtual std::string GetName() const
{
return cmGlobalVisualStudio71Generator::GetActualName();
}
static std::string GetActualName() { return "Visual Studio 7 .NET 2003"; }
/** Get the documentation entry for this generator. */
static void GetDocumentation(cmDocumentationEntry& entry);
/**
* Where does this version of Visual Studio look for macros for the
* current user? Returns the empty string if this version of Visual
* Studio does not implement support for VB macros.
*/
virtual std::string GetUserMacrosDirectory();
/**
* What is the reg key path to "vsmacros" for this version of Visual
* Studio?
*/
virtual std::string GetUserMacrosRegKeyBase();
protected:
virtual const char* GetIDEVersion() { return "7.1"; }
virtual void WriteSLNFile(std::ostream& fout, cmLocalGenerator* root,
std::vector<cmLocalGenerator*>& generators);
virtual void WriteSolutionConfigurations(

13
Source/cmGlobalVisualStudio7Generator.cxx
View File

@ -293,19 +293,6 @@ void cmGlobalVisualStudio7Generator::Generate()
if (!cmSystemTools::GetErrorOccuredFlag()) {
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::OutputSLNFile(

1
Source/cmGlobalVisualStudioGenerator.h
View File

@ -32,7 +32,6 @@ public:
/** Known versions of Visual Studio. */
enum VSVersion
{
VS71 = 71,
VS8 = 80,
VS9 = 90,
VS10 = 100,

29
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -898,8 +898,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(
// end of <Tool Name=VCMIDLTool
// Add manifest tool settings.
if (targetBuilds &&
this->GetVersion() >= cmGlobalVisualStudioGenerator::VS8) {
if (targetBuilds) {
const char* manifestTool = "VCManifestTool";
if (this->FortranProject) {
manifestTool = "VFManifestTool";
@ -1040,8 +1039,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(
fout << "\t\t\t<Tool\n"
<< "\t\t\t\tName=\"" << tool << "\"\n";
if (this->GetVersion() < cmGlobalVisualStudioGenerator::VS8 ||
this->FortranProject) {
if (this->FortranProject) {
std::ostringstream libdeps;
this->Internal->OutputObjects(libdeps, target, configName);
if (!libdeps.str().empty()) {
@ -1094,8 +1092,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(
// libraries which may be set by the user to something bad.
fout << "\t\t\t\tAdditionalDependencies=\"$(NOINHERIT) "
<< this->Makefile->GetSafeDefinition(standardLibsVar.c_str());
if (this->GetVersion() < cmGlobalVisualStudioGenerator::VS8 ||
this->FortranProject) {
if (this->FortranProject) {
this->Internal->OutputObjects(fout, target, configName, " ");
}
fout << " ";
@ -1179,8 +1176,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(
// libraries which may be set by the user to something bad.
fout << "\t\t\t\tAdditionalDependencies=\"$(NOINHERIT) "
<< this->Makefile->GetSafeDefinition(standardLibsVar.c_str());
if (this->GetVersion() < cmGlobalVisualStudioGenerator::VS8 ||
this->FortranProject) {
if (this->FortranProject) {
this->Internal->OutputObjects(fout, target, configName, " ");
}
fout << " ";
@ -1376,10 +1372,9 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
cmSourceFile const* sf = sources[si].Source;
sourcesIndex[sf] = si;
if (!sf->GetObjectLibrary().empty()) {
if (this->GetVersion() < cmGlobalVisualStudioGenerator::VS8 ||
this->FortranProject) {
// VS < 8 does not support per-config source locations so we
// list object library content on the link line instead.
if (this->FortranProject) {
// Intel Fortran does not support per-config source locations
// so we list object library content on the link line instead.
// See OutputObjects.
continue;
}
@ -1962,11 +1957,7 @@ void cmLocalVisualStudio7Generator::WriteProjectStart(
<< "<VisualStudioProject\n"
<< "\tProjectType=\"Visual C++\"\n";
/* clang-format on */
if (gg->GetVersion() == cmGlobalVisualStudioGenerator::VS71) {
fout << "\tVersion=\"7.10\"\n";
} else {
fout << "\tVersion=\"" << (gg->GetVersion() / 10) << ".00\"\n";
}
fout << "\tVersion=\"" << (gg->GetVersion() / 10) << ".00\"\n";
const char* projLabel = target->GetProperty("PROJECT_LABEL");
if (!projLabel) {
projLabel = libName.c_str();
@ -1976,9 +1967,7 @@ void cmLocalVisualStudio7Generator::WriteProjectStart(
keyword = "Win32Proj";
}
fout << "\tName=\"" << projLabel << "\"\n";
if (gg->GetVersion() >= cmGlobalVisualStudioGenerator::VS8) {
fout << "\tProjectGUID=\"{" << gg->GetGUID(libName.c_str()) << "}\"\n";
}
fout << "\tProjectGUID=\"{" << gg->GetGUID(libName.c_str()) << "}\"\n";
this->WriteProjectSCC(fout, target);
if (const char* targetFrameworkVersion =
target->GetProperty("VS_DOTNET_TARGET_FRAMEWORK_VERSION")) {

2
Source/cmSystemTools.cxx
View File

@ -617,8 +617,6 @@ bool cmSystemTools::RunSingleCommand(std::vector<std::string> const& command,
while ((pipe = cmsysProcess_WaitForData(cp, &data, &length, CM_NULLPTR)) >
0) {
// Translate NULL characters in the output into valid text.
// Visual Studio 7 puts these characters in the output of its
// build process.
for (int i = 0; i < length; ++i) {
if (data[i] == '\0') {
data[i] = ' ';

3
Source/cmVisualStudioGeneratorOptions.cxx
View File

@ -101,9 +101,6 @@ void cmVisualStudioGeneratorOptions::FixExceptionHandlingDefault()
// the flag to disable exception handling. When the user does
// remove the flag we need to override the IDE default of on.
switch (this->Version) {
case cmGlobalVisualStudioGenerator::VS71:
this->FlagMap["ExceptionHandling"] = "FALSE";
break;
case cmGlobalVisualStudioGenerator::VS10:
case cmGlobalVisualStudioGenerator::VS11:
case cmGlobalVisualStudioGenerator::VS12:

5
Source/cmake.cxx
View File

@ -63,7 +63,6 @@
#include "cmGlobalVisualStudio12Generator.h"
#include "cmGlobalVisualStudio14Generator.h"
#include "cmGlobalVisualStudio15Generator.h"
#include "cmGlobalVisualStudio71Generator.h"
#include "cmGlobalVisualStudio8Generator.h"
#include "cmGlobalVisualStudio9Generator.h"
#include "cmVSSetupHelper.h"
@ -1461,8 +1460,7 @@ void cmake::CreateDefaultGlobalGenerator()
{ "11.0", "Visual Studio 11 2012" }, //
{ "10.0", "Visual Studio 10 2010" }, //
{ "9.0", "Visual Studio 9 2008" }, //
{ "8.0", "Visual Studio 8 2005" }, //
{ "7.1", "Visual Studio 7 .NET 2003" }
{ "8.0", "Visual Studio 8 2005" }
};
static const char* const vsEntries[] = {
"\\Setup\\VC;ProductDir", //
@ -1672,7 +1670,6 @@ void cmake::AddDefaultGenerators()
this->Generators.push_back(cmGlobalVisualStudio10Generator::NewFactory());
this->Generators.push_back(cmGlobalVisualStudio9Generator::NewFactory());
this->Generators.push_back(cmGlobalVisualStudio8Generator::NewFactory());
this->Generators.push_back(cmGlobalVisualStudio71Generator::NewFactory());
this->Generators.push_back(cmGlobalBorlandMakefileGenerator::NewFactory());
this->Generators.push_back(cmGlobalNMakeMakefileGenerator::NewFactory());
this->Generators.push_back(cmGlobalJOMMakefileGenerator::NewFactory());

2
Tests/BuildDepends/CMakeLists.txt
View File

@ -42,7 +42,7 @@ list(APPEND _cmake_options "-DTEST_LINK_DEPENDS=${TEST_LINK_DEPENDS}")
list(APPEND _cmake_options "-DCMAKE_FORCE_DEPFILES=1")
if(NOT CMAKE_GENERATOR MATCHES "Visual Studio ([^789]|[789][0-9])")
if(NOT CMAKE_GENERATOR MATCHES "Visual Studio ([^89]|[89][0-9])")
set(TEST_MULTI3 1)
list(APPEND _cmake_options "-DTEST_MULTI3=1")
endif()

13
Tests/CMakeLists.txt
View File

@ -46,7 +46,7 @@ if(BUILD_TESTING)
set(CMake_TEST_DEVENV "")
if(CMAKE_VS_DEVENV_COMMAND)
set(CMake_TEST_DEVENV "${CMAKE_VS_DEVENV_COMMAND}")
elseif(CMAKE_GENERATOR MATCHES "Visual Studio [7-9] " AND
elseif(CMAKE_GENERATOR MATCHES "Visual Studio [89] " AND
NOT CMAKE_MAKE_PROGRAM MATCHES "[mM][sS][bB][uU][iI][lL][dD]\\.[eE][xX][eE]")
set(CMake_TEST_DEVENV "${CMAKE_MAKE_PROGRAM}")
endif()
@ -325,7 +325,7 @@ if(BUILD_TESTING)
endif()
endif()
if(${CMAKE_GENERATOR} MATCHES "Visual Studio ([^789]|[789][0-9])")
if(${CMAKE_GENERATOR} MATCHES "Visual Studio ([^89]|[89][0-9])")
ADD_TEST_MACRO(CSharpOnly CSharpOnly)
endif()
@ -626,8 +626,8 @@ if(BUILD_TESTING)
endif()
# test for correct sub-project generation
# not implemented in VS 7.0, Xcode, or Ninja
if(NOT CMAKE_GENERATOR MATCHES "Visual Studio 7$|Xcode|Ninja")
# not implemented in Xcode or Ninja
if(NOT CMAKE_GENERATOR MATCHES "Xcode|Ninja")
# run cmake and configure all of SubProject
# but only build the independent executable car
add_test(SubProject ${CMAKE_CTEST_COMMAND}
@ -1942,7 +1942,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
endif()
if(MSVC AND NOT MSVC_VERSION LESS 1310
AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7( |$)"
AND (NOT CMAKE_GENERATOR MATCHES "Visual Studio [89]( |$)"
OR CMAKE_SIZEOF_VOID_P EQUAL 4)
)
@ -1954,7 +1953,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
ADD_TEST_MACRO(SBCS SBCS)
endif()
if(NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio [789]( |$)"
if(NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio [89]( |$)"
AND NOT CMAKE_GENERATOR_TOOLSET)
ADD_TEST_MACRO(VSWindowsFormsResx VSWindowsFormsResx)
endif()
@ -2153,7 +2152,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
endif()
endif()
if(CMAKE_GENERATOR MATCHES "Visual Studio ([^789]|[789][0-9])" AND nasm)
if(CMAKE_GENERATOR MATCHES "Visual Studio ([^89]|[89][0-9])" AND nasm)
ADD_TEST_MACRO(VSNASM VSNASM)
endif()

2
Tests/CMakeOnly/CMakeLists.txt
View File

@ -33,7 +33,7 @@ add_CMakeOnly_test(CompilerIdCXX)
if(CMAKE_Fortran_COMPILER)
add_CMakeOnly_test(CompilerIdFortran)
endif()
if(CMAKE_GENERATOR MATCHES "Visual Studio ([^789]|[789][0-9])")
if(CMAKE_GENERATOR MATCHES "Visual Studio ([^89]|[89][0-9])")
add_CMakeOnly_test(CompilerIdCSharp)
endif()

6
Tests/ObjectLibrary/CMakeLists.txt
View File

@ -16,11 +16,7 @@ add_custom_command(TARGET UseCshared POST_BUILD COMMAND ${CMAKE_COMMAND} -P ${CM
add_executable(UseCinternal main.c c.c $<TARGET_OBJECTS:A> $<TARGET_OBJECTS:B>)
if("${CMAKE_GENERATOR}" MATCHES "^Visual Studio (7|7 .NET 2003)$")
# VS 7 generators do not add objects as sources so we need a
# dummy object to convince the IDE to build the targets below.
set(dummy dummy.obj) # In MinGW: gcc -c dummy.c -o dummy.obj
elseif("${CMAKE_GENERATOR}" MATCHES "Xcode")
if("${CMAKE_GENERATOR}" MATCHES "Xcode")
# Xcode does not seem to support targets without sources.
set(dummy dummy.c)
endif()

10
Tests/Preprocess/CMakeLists.txt
View File

@ -25,9 +25,6 @@ endif()
if("${CMAKE_GENERATOR}" MATCHES "Watcom WMake")
set(PP_WATCOM 1)
endif()
if("${CMAKE_GENERATOR}" MATCHES "Visual Studio 7$")
set(PP_VS70 1)
endif()
if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
set(PP_VS 1)
endif()
@ -46,14 +43,11 @@ endif()
# must not have it escaped inside the configured header.
set(STRING_EXTRA "")
if(NOT BORLAND AND NOT PP_VS70)
# Borland, VS70 IDE: ;
if(NOT BORLAND)
# Borland: ;
# The Borland compiler will simply not accept a non-escaped semicolon
# on the command line. If it is escaped \; then the escape character
# shows up in the preprocessing output too.
#
# The VS 7.0 IDE separates definitions on semicolons and commas with
# no regard for quotes. Fortunately VS 7.1 and above are okay.
set(SEMICOLON "\;")
endif()

2
Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
View File

@ -31,7 +31,7 @@ function(run_BuildDepends CASE)
endfunction()
run_BuildDepends(C-Exe)
if(NOT RunCMake_GENERATOR MATCHES "Visual Studio 7|Xcode")
if(NOT RunCMake_GENERATOR STREQUAL "Xcode")
if(RunCMake_GENERATOR MATCHES "Visual Studio 10")
# VS 10 forgets to re-link when a manifest changes
set(run_BuildDepends_skip_step_2 1)

4
Tests/RunCMake/CMakeLists.txt
View File

@ -270,13 +270,13 @@ endif()
if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
add_RunCMake_test(include_external_msproject)
if("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([789]|10)" AND NOT CMAKE_VS_DEVENV_COMMAND)
if("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([89]|10)" AND NOT CMAKE_VS_DEVENV_COMMAND)
set(NO_USE_FOLDERS 1)
endif()
add_RunCMake_test(VSSolution -DNO_USE_FOLDERS=${NO_USE_FOLDERS})
endif()
if("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([^789]|[789][0-9])")
if("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([^89]|[89][0-9])")
add_RunCMake_test(VS10Project)
endif()

0
Tests/RunCMake/CommandLine/DeprecateVS71-WARN-OFF.cmake
View File

5
Tests/RunCMake/CommandLine/DeprecateVS71-WARN-ON-stderr.txt
View File

@ -1,5 +0,0 @@
^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.$

0
Tests/RunCMake/CommandLine/DeprecateVS71-WARN-ON.cmake
View File

7
Tests/RunCMake/CommandLine/RunCMakeTest.cmake
View File

@ -78,13 +78,6 @@ 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

3
Tests/RunCMake/RunCMake.cmake
View File

@ -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 .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()

2
Tests/RunCMake/VSSolution/RunCMakeTest.cmake
View File

@ -12,6 +12,6 @@ run_cmake(StartupProject)
run_cmake(StartupProjectMissing)
run_cmake(AddPackageToDefault)
if(RunCMake_GENERATOR MATCHES "Visual Studio ([^7]|[7][0-9])" AND NOT NO_USE_FOLDERS)
if(NOT NO_USE_FOLDERS)
run_cmake(StartupProjectUseFolders)
endif()