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

Proposed by Cody Garver
Status: Merged
Approved by: David Gomes
Approved revision: 466
Merged at revision: 466
Proposed branch: lp:~codygarver/pantheon-terminal/fix-1076823
Merge into: lp:~elementary-apps/pantheon-terminal/trunk
Diff against target: 18 lines (+9/-0)
1 file modified
CMakeLists.txt (+9/-0)
To merge this branch: bzr merge lp:~codygarver/pantheon-terminal/fix-1076823
Reviewer Review Type Date Requested Status
David Gomes (community) Approve
Review via email: mp+155666@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
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-03-04 17:26:46 +0000
+++ CMakeLists.txt 2013-03-27 06:30:29 +0000
@@ -27,6 +27,15 @@
27configure_file (${CMAKE_SOURCE_DIR}/src/config.vala.cmake ${CMAKE_SOURCE_DIR}/src/config.vala)27configure_file (${CMAKE_SOURCE_DIR}/src/config.vala.cmake ${CMAKE_SOURCE_DIR}/src/config.vala)
28add_definitions (-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")28add_definitions (-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
2929
30# Add 'make dist' command for creating release tarball
31set (CPACK_PACKAGE_VERSION ${VERSION})
32set (CPACK_SOURCE_GENERATOR "TGZ")
33set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
34set (CPACK_SOURCE_IGNORE_FILES "/build/;/.bzr/;/.bzrignore;~$;${CPACK_SOURCE_IGNORE_FILES}")
35
36include (CPack)
37add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
38
30find_package (PkgConfig)39find_package (PkgConfig)
31pkg_check_modules (DEPS REQUIRED gthread-2.0 gtk+-3.0 granite vte-2.90 libnotify gdk-3.0)40pkg_check_modules (DEPS REQUIRED gthread-2.0 gtk+-3.0 granite vte-2.90 libnotify gdk-3.0)
3241

Subscribers

People subscribed via source and target branches