[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.96.2.4 1.96.2.5

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/SimpleInstall
In directory public:/mounts/ram/cvs-serv18450/Tests/SimpleInstall

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt 
Log Message:
ENH: 2.6.2 rc 2 merge from main tree


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/SimpleInstall/CMakeLists.txt,v
retrieving revision 1.96.2.4
retrieving revision 1.96.2.5
diff -C 2 -d -r1.96.2.4 -r1.96.2.5
*** CMakeLists.txt	25 Jun 2008 13:52:04 -0000	1.96.2.4
--- CMakeLists.txt	3 Sep 2008 13:43:31 -0000	1.96.2.5
***************
*** 67,73 ****
      DOC "Fourth library")
  
    INCLUDE_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/MyTest/include)
    ADD_EXECUTABLE (SimpleInstExeS2 inst2.cxx foo.c foo.h)
!   TARGET_LINK_LIBRARIES(SimpleInstExeS2 ${TEST1_LIBRARY} ${TEST2_LIBRARY} ${TEST4_LIBRARY})
    SET(install_target SimpleInstExeS2)
  
--- 67,77 ----
      DOC "Fourth library")
  
+   # Test importing a library found on disk.
+   ADD_LIBRARY(lib_test4 UNKNOWN IMPORTED)
+   SET_PROPERTY(TARGET lib_test4 PROPERTY IMPORTED_LOCATION ${TEST4_LIBRARY})
+ 
    INCLUDE_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/MyTest/include)
    ADD_EXECUTABLE (SimpleInstExeS2 inst2.cxx foo.c foo.h)
!   TARGET_LINK_LIBRARIES(SimpleInstExeS2 ${TEST1_LIBRARY} ${TEST2_LIBRARY} lib_test4)
    SET(install_target SimpleInstExeS2)