From 56c0bbc83f079d0f3ff4487360a44271a6724778 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Thu, 30 Aug 2007 16:23:12 -0400 Subject: STYLE: adapt the test to the change from FILENAME to FILE -add a call to the EXPORT() command Alex --- Tests/SimpleInstall/CMakeLists.txt | 6 +++++- Tests/SimpleInstallS2/CMakeLists.txt | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index 2ac42e0..1e4cde9 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -205,10 +205,14 @@ ELSE(STAGE2) scripts/sample_script scripts/sample_script.bat) # "export" the targets collected in "SimpleInstallS1" - INSTALL(EXPORT SimpleInstallS1 FILENAME SimpleInstallS1Config.cmake + INSTALL(EXPORT SimpleInstallS1 FILE SimpleInstallS1Config.cmake DESTINATION MyTest/lib PREFIX S1_ ) + EXPORT(TARGETS SimpleInstall test1 test2 test3 + FILE "${CMAKE_CURRENT_BINARY_DIR}/SimpleInstallS1Config.cmake" + PREFIX S2_ ) + ADD_SUBDIRECTORY(scripts) # Test optional installation. diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index 2ac42e0..1e4cde9 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -205,10 +205,14 @@ ELSE(STAGE2) scripts/sample_script scripts/sample_script.bat) # "export" the targets collected in "SimpleInstallS1" - INSTALL(EXPORT SimpleInstallS1 FILENAME SimpleInstallS1Config.cmake + INSTALL(EXPORT SimpleInstallS1 FILE SimpleInstallS1Config.cmake DESTINATION MyTest/lib PREFIX S1_ ) + EXPORT(TARGETS SimpleInstall test1 test2 test3 + FILE "${CMAKE_CURRENT_BINARY_DIR}/SimpleInstallS1Config.cmake" + PREFIX S2_ ) + ADD_SUBDIRECTORY(scripts) # Test optional installation. -- cgit v0.12