[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.154 1.155
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Jul 24 13:17:40 EDT 2009
Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv6517a
Modified Files:
CMakeLists.txt
Log Message:
ENH: Install all Modules and Templates
This removes the file-wise installation rules for Modules and Templates
and instead installs the whole directories. This approach is much less
error-prone. The old approach was left from before CMake had the
install(DIRECTORY) command.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.154
retrieving revision 1.155
diff -C 2 -d -r1.154 -r1.155
*** CMakeLists.txt 11 Jun 2009 19:18:51 -0000 1.154
--- CMakeLists.txt 24 Jul 2009 17:17:36 -0000 1.155
***************
*** 375,378 ****
--- 375,379 ----
"Install location for man pages (relative to prefix).")
MARK_AS_ADVANCED(CMAKE_DATA_DIR CMAKE_DOC_DIR CMAKE_MAN_DIR)
+ STRING(REGEX REPLACE "^/" "" CMake_DATA_DEST "${CMAKE_DATA_DIR}")
# include special compile flags for some compilers
***************
*** 466,471 ****
# build the remaining subdirectories
SUBDIRS(Source)
- SUBDIRS(Modules)
- SUBDIRS(Templates)
SUBDIRS(Utilities)
SUBDIRS(Tests)
--- 467,470 ----
***************
*** 475,478 ****
--- 474,491 ----
--system-information -G "${CMAKE_TEST_GENERATOR}" )
+ # Install script directories.
+ INSTALL(
+ DIRECTORY Modules Templates
+ DESTINATION "${CMake_DATA_DEST}"
+ FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+ DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE
+ GROUP_READ GROUP_EXECUTE
+ WORLD_READ WORLD_EXECUTE
+ PATTERN "*.sh.in" PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE
+ GROUP_READ GROUP_EXECUTE
+ WORLD_READ WORLD_EXECUTE
+ PATTERN "CVS" EXCLUDE
+ )
+
#-----------------------------------------------------------------------
# End of the main section of the CMakeLists file
More information about the Cmake-commits
mailing list