diff options
| author | Brad King <brad.king@kitware.com> | 2008-01-28 13:39:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-01-28 13:39:25 (GMT) |
| commit | 1332b557941e461b6651efdda895f55a778dd644 (patch) | |
| tree | 1525fa8cfe7e0ab4963feaa2fba7184ad66dcb9b /Tests | |
| parent | 5594ad488576a77d9c6b8c3c1999a04fb4e6867d (diff) | |
| download | CMake-1332b557941e461b6651efdda895f55a778dd644.zip CMake-1332b557941e461b6651efdda895f55a778dd644.tar.gz CMake-1332b557941e461b6651efdda895f55a778dd644.tar.bz2 | |
BUG: Updated SimpleInstall tests for new export/import interface.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/SimpleInstall/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | Tests/SimpleInstallS2/CMakeLists.txt | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index 25b54ab..34989d2 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -145,10 +145,10 @@ IF(STAGE2) # 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 @@ ELSE(STAGE2) # "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) diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index 25b54ab..34989d2 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -145,10 +145,10 @@ IF(STAGE2) # 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 @@ ELSE(STAGE2) # "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) |