Просмотр исходного кода

STYLE: adapt the test to the change from FILENAME to FILE
-add a call to the EXPORT() command

Alex

Alexander Neundorf 18 лет назад
Родитель
Сommit
56c0bbc83f
2 измененных файлов с 10 добавлено и 2 удалено
  1. 5 1
      Tests/SimpleInstall/CMakeLists.txt
  2. 5 1
      Tests/SimpleInstallS2/CMakeLists.txt

+ 5 - 1
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.

+ 5 - 1
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.