[cmake-commits] king committed CMakeLists.txt 1.74 1.75

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Added more install rules to increase coverage of the command.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/SimpleInstall/CMakeLists.txt,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- CMakeLists.txt	25 May 2007 15:41:37 -0000	1.74
+++ CMakeLists.txt	28 May 2007 15:41:29 -0000	1.75
@@ -103,7 +103,7 @@
   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 @@
     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 @@
   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)