Pantheon Print

Merge lp:~codygarver/pantheon-print/release-0.1.1 into lp:~elementary-apps/pantheon-print/trunk

  1. release-0.1.1
  2. Merge into trunk
Proposed by Cody Garver
Status: Merged
Approved by: Cody Garver
Approved revision: 8
Merged at revision: 8
Proposed branch: lp:~codygarver/pantheon-print/release-0.1.1
Merge into: lp:~elementary-apps/pantheon-print/trunk
Diff against target: 25 lines (+2/-3)
1 file modified
CMakeLists.txt (+2/-3)
To merge this branch: bzr merge lp:~codygarver/pantheon-print/release-0.1.1
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+168821@code.launchpad.net
To post a comment you must log in.

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-09-04 16:31:27 +0000
3+++ CMakeLists.txt 2013-06-11 22:00:35 +0000
4@@ -3,7 +3,7 @@
5 project (print)
6 cmake_minimum_required (VERSION 2.8)
7 cmake_policy (VERSION 2.6)
8-list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/vala)
9+list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
10 #
11
12 # Base bits
13@@ -14,11 +14,10 @@
14 set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
15 set (PKGDATADIR "${DATADIR}/print")
16 set (RELEASE_NAME "Print utility.")
17-set (VERSION "0.1")
18+set (VERSION "0.1.1")
19 set (CMAKE_C_FLAGS "-ggdb")
20 set (PREFIX ${CMAKE_INSTALL_PREFIX})
21 set (DOLLAR "$")
22-list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
23 find_package(PkgConfig)
24 pkg_check_modules(DEPS REQUIRED gtk+-3.0)
25 add_definitions(${DEPS_CFLAGS})

Subscribers

People subscribed via source and target branches