Greeter

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

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

Oops, sorry sorry sorry forgot to Approve before merging.

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 2013-03-09 09:48:24 +0000
3+++ CMakeLists.txt 2013-03-27 07:55:27 +0000
4@@ -1,8 +1,7 @@
5 project (pantheon-greeter)
6 cmake_minimum_required (VERSION 2.8)
7-cmake_policy (VERSION 2.6)
8+cmake_policy (VERSION 2.8)
9
10-list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/vala)
11 enable_testing ()
12
13 list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
14@@ -10,10 +9,20 @@
15 set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
16 set (PKGDATADIR "${DATADIR}/pantheon-greeter")
17 set (CMAKE_INSTALL_PREFIX /usr)
18+set (VERSION "0.1")
19
20 configure_file (${CMAKE_SOURCE_DIR}/src/config.vala.cmake ${CMAKE_BINARY_DIR}/src/config.vala)
21 add_definitions (-DGETTEXT_PACKAGE="pantheon-greeter")
22
23+# Add 'make dist' command for creating release tarball
24+set (CPACK_PACKAGE_VERSION ${VERSION})
25+set (CPACK_SOURCE_GENERATOR "TGZ")
26+set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
27+set (CPACK_SOURCE_IGNORE_FILES "/build/;/.bzr/;/.bzrignore;~$;${CPACK_SOURCE_IGNORE_FILES}")
28+
29+include (CPack)
30+add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
31+
32 find_package (PkgConfig)
33 pkg_check_modules (DEPS REQUIRED granite liblightdm-gobject-1 gdk-x11-3.0 clutter-gtk-1.0 indicator3-0.4 gdk-pixbuf-2.0 gl)
34 add_definitions (${DEPS_CFLAGS})
35@@ -22,7 +31,7 @@
36
37 find_package (Vala REQUIRED)
38 include (ValaVersion)
39-ensure_vala_version ("0.16.0" MINIMUM)
40+ensure_vala_version ("0.16.1" MINIMUM)
41
42 file(GLOB_RECURSE sources src/*.vala)
43

Subscribers

People subscribed via source and target branches