diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-09 14:42:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-03-09 14:42:18 (GMT) |
| commit | b42866a34a742f89a35382d17d58070c73486d92 (patch) | |
| tree | 5728aef86df7ff0d6a677875b442d12147da2e46 /Tests/ExportImport | |
| parent | cd9ba3ec453d547b15ab761e20793a1a17bbbd8d (diff) | |
| download | CMake-b42866a34a742f89a35382d17d58070c73486d92.zip CMake-b42866a34a742f89a35382d17d58070c73486d92.tar.gz CMake-b42866a34a742f89a35382d17d58070c73486d92.tar.bz2 | |
Drop Visual Studio 6 generator
This generator has been deprecated since CMake 3.3. Remove it.
Update documentation, modules, and tests to drop content specific
to this generator.
Diffstat (limited to 'Tests/ExportImport')
| -rw-r--r-- | Tests/ExportImport/Export/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | Tests/ExportImport/Export/testLib4libdbg1.c | 1 | ||||
| -rw-r--r-- | Tests/ExportImport/Export/testLib4libopt1.c | 1 |
3 files changed, 2 insertions, 10 deletions
diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt index c2ecb0b..f504c7b 100644 --- a/Tests/ExportImport/Export/CMakeLists.txt +++ b/Tests/ExportImport/Export/CMakeLists.txt @@ -79,12 +79,6 @@ set_property(TARGET testLib7 PROPERTY OUTPUT_NAME_DEBUG testLib7D-$<CONFIG>) set_property(TARGET testLib7 PROPERTY OUTPUT_NAME_RELEASE testLib7R-$<CONFIG>) set_property(TARGET testLib7 PROPERTY OUTPUT_NAME testLib7-$<CONFIG>) -# Work-around: Visual Studio 6 does not support per-target object files. -set(VS6) -if("${CMAKE_GENERATOR}" MATCHES "Visual Studio 6") - set(VS6 1) -endif() - # Test using the target_link_libraries command to set the # LINK_INTERFACE_LIBRARIES* properties. We construct two libraries # providing the same two symbols. In each library one of the symbols @@ -93,8 +87,8 @@ endif() # configuration in which it is built. If the proper library is not # used via the link interface the import test will fail to link. add_library(testLib4lib STATIC testLib4lib.c) -add_library(testLib4libdbg STATIC testLib4libopt.c testLib4libdbg${VS6}.c) -add_library(testLib4libopt STATIC testLib4libdbg.c testLib4libopt${VS6}.c) +add_library(testLib4libdbg STATIC testLib4libopt.c testLib4libdbg.c) +add_library(testLib4libopt STATIC testLib4libdbg.c testLib4libopt.c) set_property(TARGET testLib4libdbg PROPERTY COMPILE_DEFINITIONS LIB_DBG) set_property(TARGET testLib4libopt PROPERTY COMPILE_DEFINITIONS LIB_OPT) target_link_libraries(testLib4 diff --git a/Tests/ExportImport/Export/testLib4libdbg1.c b/Tests/ExportImport/Export/testLib4libdbg1.c deleted file mode 100644 index cc56cf9..0000000 --- a/Tests/ExportImport/Export/testLib4libdbg1.c +++ /dev/null @@ -1 +0,0 @@ -#include "testLib4libdbg.c" diff --git a/Tests/ExportImport/Export/testLib4libopt1.c b/Tests/ExportImport/Export/testLib4libopt1.c deleted file mode 100644 index d9b5587..0000000 --- a/Tests/ExportImport/Export/testLib4libopt1.c +++ /dev/null @@ -1 +0,0 @@ -#include "testLib4libopt.c" |