Wingpanel

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

  1. fix-1076823
  2. Merge into old-trunk
Proposed by Cody Garver
Status: Merged
Approved by: David Gomes
Approved revision: 122
Merged at revision: 122
Proposed branch: lp:~codygarver/wingpanel/fix-1076823
Merge into: lp:~elementary-pantheon/wingpanel/old-trunk
Diff against target: 28 lines (+10/-1)
1 file modified
CMakeLists.txt (+10/-1)
To merge this branch: bzr merge lp:~codygarver/wingpanel/fix-1076823
Reviewer Review Type Date Requested Status
David Gomes (community) Approve
Review via email: mp+155671@code.launchpad.net
To post a comment you must log in.
Revision history for this message
David Gomes (davidgomes) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-11-13 22:12:07 +0000
3+++ CMakeLists.txt 2013-03-27 07:28:23 +0000
4@@ -2,7 +2,7 @@
5
6 project (wingpanel)
7 cmake_minimum_required (VERSION 2.8)
8-cmake_policy (VERSION 2.6)
9+cmake_policy (VERSION 2.8)
10
11 list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/vala)
12
13@@ -22,6 +22,15 @@
14 set (PREFIX ${CMAKE_INSTALL_PREFIX})
15 set (DOLLAR "$")
16
17+# Add 'make dist' command for creating release tarball
18+set (CPACK_PACKAGE_VERSION ${VERSION})
19+set (CPACK_SOURCE_GENERATOR "TGZ")
20+set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
21+set (CPACK_SOURCE_IGNORE_FILES "/build/;/.bzr/;/.bzrignore;~$;${CPACK_SOURCE_IGNORE_FILES}")
22+
23+include (CPack)
24+add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
25+
26 # Set dependencies
27 set (WINGPANEL_DEPS "gobject-2.0;glib-2.0;gio-2.0;gee-1.0;gdk-x11-3.0;x11;gtk+-3.0;granite")
28 set (WINGPANEL_DEPS_NOVALA "gthread-2.0;indicator3-0.4")

Subscribers

People subscribed via source and target branches

to all changes: