[cmake-commits] king committed CMakeLists.txt 1.95 1.96

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
BUG: Updated SimpleInstall tests for new export/import interface.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/SimpleInstall/CMakeLists.txt,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- CMakeLists.txt	2 Jan 2008 20:17:56 -0000	1.95
+++ CMakeLists.txt	28 Jan 2008 13:39:25 -0000	1.96
@@ -145,10 +145,10 @@
 # try to import the exported targets again
   SET(SimpleInstallS1_DIR ${CMAKE_INSTALL_PREFIX}/MyTest/lib)
   FIND_PACKAGE(SimpleInstallS1 REQUIRED)
-  GET_TARGET_PROPERTY(simpleInstallLocation S1_SimpleInstall LOCATION)
-  IF(NOT simpleInstallLocation)
-    MESSAGE(FATAL_ERROR "Target S1_SimpleInstall could not be imported, location: ${simpleInstallLocation}")
-  ENDIF(NOT simpleInstallLocation)
+  GET_TARGET_PROPERTY(simpleInstallImported S1_SimpleInstall IMPORTED)
+  IF(NOT simpleInstallImported)
+    MESSAGE(FATAL_ERROR "Target S1_SimpleInstall could not be imported")
+  ENDIF(NOT simpleInstallImported)
 
 ELSE(STAGE2)
   # Wipe out the install directory to do a fresh test.
@@ -214,11 +214,11 @@
 # "export" the targets collected in "SimpleInstallS1"
   INSTALL(EXPORT SimpleInstallS1 FILE SimpleInstallS1Config.cmake 
                                  DESTINATION MyTest/lib 
-                                 PREFIX S1_ )
+                                 NAMESPACE S1_ )
 
   EXPORT(TARGETS SimpleInstall test1 test2 test3 
          FILE "${CMAKE_CURRENT_BINARY_DIR}/SimpleInstallS1Config.cmake"
-         PREFIX S2_ )
+         NAMESPACE S2_ )
 
   ADD_SUBDIRECTORY(scripts)