From 61367c69d7168a1ffcf39266cdb0784200e57e94 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 13 Jul 2009 09:20:36 -0400 Subject: COMP: Fix ExportImport testLib6 on VS6 The compiler does not support multiple source files differing only by extension in one target. This renames the C source file in the test. --- Tests/ExportImport/Export/CMakeLists.txt | 2 +- Tests/ExportImport/Export/testLib6.c | 5 ----- Tests/ExportImport/Export/testLib6c.c | 5 +++++ 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 Tests/ExportImport/Export/testLib6.c create mode 100644 Tests/ExportImport/Export/testLib6c.c diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt index 1588b0c..0dd2550 100644 --- a/Tests/ExportImport/Export/CMakeLists.txt +++ b/Tests/ExportImport/Export/CMakeLists.txt @@ -45,7 +45,7 @@ set_property(TARGET testLib4 PROPERTY FRAMEWORK 1) add_library(testLib5 SHARED testLib5.c) -add_library(testLib6 STATIC testLib6.cxx testLib6.c) +add_library(testLib6 STATIC testLib6.cxx testLib6c.c) # Work-around: Visual Studio 6 does not support per-target object files. set(VS6) diff --git a/Tests/ExportImport/Export/testLib6.c b/Tests/ExportImport/Export/testLib6.c deleted file mode 100644 index 493ca07..0000000 --- a/Tests/ExportImport/Export/testLib6.c +++ /dev/null @@ -1,5 +0,0 @@ -extern int testLib6cxx(void); -int testLib6(void) -{ - return testLib6cxx(); -} diff --git a/Tests/ExportImport/Export/testLib6c.c b/Tests/ExportImport/Export/testLib6c.c new file mode 100644 index 0000000..493ca07 --- /dev/null +++ b/Tests/ExportImport/Export/testLib6c.c @@ -0,0 +1,5 @@ +extern int testLib6cxx(void); +int testLib6(void) +{ + return testLib6cxx(); +} -- cgit v0.12