Merge lp:~codygarver/wingpanel/fix-1076823 into lp:~elementary-pantheon/wingpanel/old-trunk

[Cody Garver]

[David Gomes (davidgomes)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-11-13 22:12:07 +0000
+++ CMakeLists.txt	2013-03-27 07:28:23 +0000
@@ -2,7 +2,7 @@
 
 project (wingpanel)
 cmake_minimum_required (VERSION 2.8)
-cmake_policy (VERSION 2.6)
+cmake_policy (VERSION 2.8)
 
 list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/vala)
 
@@ -22,6 +22,15 @@
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
 set (DOLLAR "$")
 
+# Add 'make dist' command for creating release tarball
+set (CPACK_PACKAGE_VERSION ${VERSION})
+set (CPACK_SOURCE_GENERATOR "TGZ")
+set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
+set (CPACK_SOURCE_IGNORE_FILES "/build/;/.bzr/;/.bzrignore;~$;${CPACK_SOURCE_IGNORE_FILES}")
+
+include (CPack)
+add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+
 # Set dependencies
 set (WINGPANEL_DEPS "gobject-2.0;glib-2.0;gio-2.0;gee-1.0;gdk-x11-3.0;x11;gtk+-3.0;granite")
 set (WINGPANEL_DEPS_NOVALA "gthread-2.0;indicator3-0.4")