[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.1 1.2 imp_testExe1.c 1.1 1.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/ExportImport/Import/A
In directory public:/mounts/ram/cvs-serv7060/Tests/ExportImport/Import/A

Modified Files:
	CMakeLists.txt imp_testExe1.c 
Log Message:
ENH: Allow IMPORTED_IMPLIB w/o IMPORTED_LOCATION

Linking to a Windows shared library (.dll) requires only its import
library (.lib).  This teaches CMake to recognize SHARED IMPORTED library
targets that set only IMPORTED_IMPLIB and not IMPORTED_LOCATION.


Index: imp_testExe1.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExportImport/Import/A/imp_testExe1.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** imp_testExe1.c	6 Apr 2009 15:11:11 -0000	1.1
--- imp_testExe1.c	8 Apr 2009 20:29:04 -0000	1.2
***************
*** 5,8 ****
--- 5,9 ----
  extern int testLib4();
  extern int testLib4lib();
+ extern int testLib5();
  
  /* Switch a symbol between debug and optimized builds to make sure the
***************
*** 18,21 ****
--- 19,23 ----
  {
    return (testLib2() + generated_by_testExe1() + testLib3() + testLib4()
+           + testLib5()
            + generated_by_testExe3() + testLib4lib() + testLib4libcfg());
  }

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExportImport/Import/A/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** CMakeLists.txt	6 Apr 2009 15:11:02 -0000	1.1
--- CMakeLists.txt	8 Apr 2009 20:29:04 -0000	1.2
***************
*** 24,28 ****
  
  # Try linking to a library imported from the install tree.
! target_link_libraries(imp_testExe1 exp_testLib2 exp_testLib3 exp_testLib4)
  
  # Try building a plugin to an executable imported from the install tree.
--- 24,33 ----
  
  # Try linking to a library imported from the install tree.
! target_link_libraries(imp_testExe1
!   exp_testLib2
!   exp_testLib3
!   exp_testLib4
!   exp_testLib5
!   )
  
  # Try building a plugin to an executable imported from the install tree.
***************
*** 49,53 ****
  
  # Try linking to a library imported from the build tree.
! target_link_libraries(imp_testExe1b bld_testLib2 bld_testLib3 bld_testLib4)
  
  # Try building a plugin to an executable imported from the build tree.
--- 54,63 ----
  
  # Try linking to a library imported from the build tree.
! target_link_libraries(imp_testExe1b
!   bld_testLib2
!   bld_testLib3
!   bld_testLib4
!   bld_testLib5
!   )
  
  # Try building a plugin to an executable imported from the build tree.