diff options
| author | Brad King <brad.king@kitware.com> | 2007-05-28 15:41:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-05-28 15:41:29 (GMT) |
| commit | 06472d620a73b51bdfddcb64987cffabddfb07f3 (patch) | |
| tree | 67d0cc4377fcfdedaefae9d02ace53f21958a949 | |
| parent | 09289aadb6934aebee01f2b8ca65c842004203c0 (diff) | |
| download | CMake-06472d620a73b51bdfddcb64987cffabddfb07f3.zip CMake-06472d620a73b51bdfddcb64987cffabddfb07f3.tar.gz CMake-06472d620a73b51bdfddcb64987cffabddfb07f3.tar.bz2 | |
ENH: Added more install rules to increase coverage of the command.
| -rw-r--r-- | Tests/SimpleInstall/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | Tests/SimpleInstallS2/CMakeLists.txt | 16 |
2 files changed, 30 insertions, 2 deletions
diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index 36ca945..1f80b32 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -103,7 +103,7 @@ IF(STAGE2) ELSE(WIN32 AND NOT CYGWIN) SET(BAT) ENDIF(WIN32 AND NOT CYGWIN) - FOREACH(loc share share/old1 share/old2 share/old3) + FOREACH(loc share share/old1 share/old2 share/old3 share/alt) SET(CUR_SCRIPT "${CMAKE_INSTALL_PREFIX}/MyTest/${loc}/sample_script${BAT}") EXECUTE_PROCESS( COMMAND ${CUR_SCRIPT} @@ -173,10 +173,12 @@ ELSE(STAGE2) RUNTIME DESTINATION MyTest/bin LIBRARY DESTINATION MyTest/lib ARCHIVE DESTINATION MyTest/lib/static + OPTIONAL # for coverage...target should always exist ) INSTALL(FILES lib1.h DESTINATION MyTest/include/foo) INSTALL(FILES lib2.h DESTINATION MyTest/include/foo + COMPONENT Development PERMISSIONS OWNER_READ OWNER_WRITE RENAME lib2renamed.h ) @@ -207,11 +209,23 @@ ELSE(STAGE2) FILE(REMOVE_RECURSE "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/CVS") INSTALL( DIRECTORY TestSubDir scripts/ DESTINATION MyTest/share + FILE_PERMISSIONS OWNER_READ OWNER_WRITE + DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE PATTERN "CVS" EXCLUDE REGEX "\\.txt$" EXCLUDE PATTERN "scripts/*" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ ) + # Alternate directory installation for coverage. + INSTALL( + DIRECTORY scripts/ DESTINATION MyTest/share/alt + COMPONENT Development + USE_SOURCE_PERMISSIONS + PATTERN "CVS" EXCLUDE + REGEX "\\.txt$" EXCLUDE + ) + # Test empty directory installation. INSTALL(DIRECTORY DESTINATION MyTest/share/empty) diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index 36ca945..1f80b32 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -103,7 +103,7 @@ IF(STAGE2) ELSE(WIN32 AND NOT CYGWIN) SET(BAT) ENDIF(WIN32 AND NOT CYGWIN) - FOREACH(loc share share/old1 share/old2 share/old3) + FOREACH(loc share share/old1 share/old2 share/old3 share/alt) SET(CUR_SCRIPT "${CMAKE_INSTALL_PREFIX}/MyTest/${loc}/sample_script${BAT}") EXECUTE_PROCESS( COMMAND ${CUR_SCRIPT} @@ -173,10 +173,12 @@ ELSE(STAGE2) RUNTIME DESTINATION MyTest/bin LIBRARY DESTINATION MyTest/lib ARCHIVE DESTINATION MyTest/lib/static + OPTIONAL # for coverage...target should always exist ) INSTALL(FILES lib1.h DESTINATION MyTest/include/foo) INSTALL(FILES lib2.h DESTINATION MyTest/include/foo + COMPONENT Development PERMISSIONS OWNER_READ OWNER_WRITE RENAME lib2renamed.h ) @@ -207,11 +209,23 @@ ELSE(STAGE2) FILE(REMOVE_RECURSE "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/CVS") INSTALL( DIRECTORY TestSubDir scripts/ DESTINATION MyTest/share + FILE_PERMISSIONS OWNER_READ OWNER_WRITE + DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE PATTERN "CVS" EXCLUDE REGEX "\\.txt$" EXCLUDE PATTERN "scripts/*" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ ) + # Alternate directory installation for coverage. + INSTALL( + DIRECTORY scripts/ DESTINATION MyTest/share/alt + COMPONENT Development + USE_SOURCE_PERMISSIONS + PATTERN "CVS" EXCLUDE + REGEX "\\.txt$" EXCLUDE + ) + # Test empty directory installation. INSTALL(DIRECTORY DESTINATION MyTest/share/empty) |