summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPřemysl Janouch <p.janouch@gmail.com>2011-07-05 13:11:49 +0200
committerPřemysl Janouch <p.janouch@gmail.com>2011-07-05 13:11:49 +0200
commit50b0d3c3951e00a936bae983b3f712fb95548d0f (patch)
tree0c298b1e4d4ee140f5dc0ba1ea8c98dcd06b1d63
parent4e440eb35b2de9bed4d957c271cbfa136485b543 (diff)
downloadlogdiag-50b0d3c3951e00a936bae983b3f712fb95548d0f.tar.gz
logdiag-50b0d3c3951e00a936bae983b3f712fb95548d0f.tar.xz
logdiag-50b0d3c3951e00a936bae983b3f712fb95548d0f.zip
Ignore Qt Creator settings file in the tree.
-rw-r--r--.gitignore1
-rw-r--r--CMakeLists.txt2
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 7d1da53..b0705bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/build
/win32-depends
/liblogdiag/ld-marshal.[ch]
+/CMakeLists.txt.user
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c8a144..c2afe1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -389,7 +389,7 @@ set (CPACK_RPM_PACKAGE_LICENSE "BSD")
set (CPACK_RPM_PACKAGE_URL "${project_URL}")
set (CPACK_SOURCE_GENERATOR "TGZ;ZIP")
-set (CPACK_SOURCE_IGNORE_FILES "/.git;/build;/win32-depends;/liblogdiag/ld-marshal.[ch]")
+set (CPACK_SOURCE_IGNORE_FILES "/\\\\.git;/build;/CMakeLists.txt.user;/win32-depends;/liblogdiag/ld-marshal.[ch]")
set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${project_VERSION}")
include (CPack)