Merge 1.3.6 r653:654 into trunk

This commit is contained in:
Nick Bolton 2010-06-21 20:10:47 +00:00
parent 8d0ec989d1
commit df1fbee986
1 changed files with 1 additions and 2 deletions

View File

@ -102,12 +102,11 @@ ENDIF(WIN32)
# For source package, leave out temp and Mercurial stuff. # For source package, leave out temp and Mercurial stuff.
SET(CPACK_SOURCE_IGNORE_FILES SET(CPACK_SOURCE_IGNORE_FILES
"/build/" # Temp CMake build dir.
"/bin/" # Temp binary output dir. "/bin/" # Temp binary output dir.
"/.hg/" # Mercurial repo cache. "/.hg/" # Mercurial repo cache.
"/.hgignore" # Mercurial ignore list (not neede by end-user). "/.hgignore" # Mercurial ignore list (not neede by end-user).
".*~" # Emacs temporary files. ".*~" # Emacs temporary files.
"/config.h" # The config.h file should be generated. "/config.h$" # The config.h file should be generated.
) )
# Must be last (since it relies of CPACK_ vars). # Must be last (since it relies of CPACK_ vars).