[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.19 1.20 testLib6.c 1.1 NONE testLib6c.c NONE 1.1

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Jul 13 09:20:38 EDT 2009


Update of /cvsroot/CMake/CMake/Tests/ExportImport/Export
In directory public:/mounts/ram/cvs-serv23903/Tests/ExportImport/Export

Modified Files:
	CMakeLists.txt 
Added Files:
	testLib6c.c 
Removed Files:
	testLib6.c 
Log Message:
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.


--- testLib6.c DELETED ---

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExportImport/Export/CMakeLists.txt,v
retrieving revision 1.19
retrieving revision 1.20
diff -C 2 -d -r1.19 -r1.20
*** CMakeLists.txt	11 Jul 2009 14:10:49 -0000	1.19
--- CMakeLists.txt	13 Jul 2009 13:20:35 -0000	1.20
***************
*** 46,50 ****
  add_library(testLib5 SHARED testLib5.c)
  
! add_library(testLib6 STATIC testLib6.cxx testLib6.c)
  
  # Work-around: Visual Studio 6 does not support per-target object files.
--- 46,50 ----
  add_library(testLib5 SHARED testLib5.c)
  
! add_library(testLib6 STATIC testLib6.cxx testLib6c.c)
  
  # Work-around: Visual Studio 6 does not support per-target object files.

--- NEW FILE: testLib6c.c ---
extern int testLib6cxx(void);
int testLib6(void)
{
  return testLib6cxx();
}



More information about the Cmake-commits mailing list