[cmake-commits] king committed CMakeLists.txt 1.93 1.95

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Jan 2 15:17:58 EST 2008


Update of /cvsroot/CMake/CMake/Tests/SimpleInstallS2
In directory public:/mounts/ram/cvs-serv23335/Tests/SimpleInstallS2

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Added FILES_MATCHING option to INSTALL(DIRECTORY).  This will help install a tree of header files while ignoring non-headers.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/SimpleInstallS2/CMakeLists.txt,v
retrieving revision 1.93
retrieving revision 1.95
diff -u -d -r1.93 -r1.95
--- CMakeLists.txt	1 Jan 2008 15:54:49 -0000	1.93
+++ CMakeLists.txt	2 Jan 2008 20:17:56 -0000	1.95
@@ -97,6 +97,12 @@
   IF(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/CMakeLists.txt")
     MESSAGE(FATAL_ERROR "Directory installation installed CMakeLists.txt.")
   ENDIF(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/CMakeLists.txt")
+  IF(NOT EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/alt/TestSubDir/TSD.h")
+    MESSAGE(FATAL_ERROR "Directory installation did not install alternate TSD.h")
+  ENDIF(NOT EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/alt/TestSubDir/TSD.h")
+  IF(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/alt/TestSubDir/TSD.cxx")
+    MESSAGE(FATAL_ERROR "Directory installation installed alternate TSD.cxx")
+  ENDIF(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/alt/TestSubDir/TSD.cxx")
 
   # Check that scripts properly installed.
   IF(WIN32 AND NOT CYGWIN)
@@ -248,6 +254,13 @@
     PATTERN "CVS" EXCLUDE
     REGEX "\\.txt$" EXCLUDE
     )
+  INSTALL(
+    DIRECTORY TestSubDir DESTINATION MyTest/share/alt
+    FILE_PERMISSIONS OWNER_READ OWNER_WRITE
+    DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+                          GROUP_READ GROUP_EXECUTE
+    FILES_MATCHING PATTERN "*.h"
+    )
 
   # Test empty directory installation.
   INSTALL(DIRECTORY DESTINATION MyTest/share/empty)



More information about the Cmake-commits mailing list