Scratch

Merge lp:~codygarver/scratch/fix-1076823 into lp:~elementary-apps/scratch/scratch

  1. fix-1076823
  2. Merge into scratch
Proposed by Cody Garver
Status: Merged
Approved by: David Gomes
Approved revision: 1009
Merged at revision: 1009
Proposed branch: lp:~codygarver/scratch/fix-1076823
Merge into: lp:~elementary-apps/scratch/scratch
Diff against target: 36 lines (+12/-3)
1 file modified
CMakeLists.txt (+12/-3)
To merge this branch: bzr merge lp:~codygarver/scratch/fix-1076823
Reviewer Review Type Date Requested Status
David Gomes (community) Approve
Review via email: mp+155672@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-12-25 10:13:19 +0000
3+++ CMakeLists.txt 2013-03-27 07:44:21 +0000
4@@ -1,7 +1,7 @@
5 # Check http://elementaryos.org/docs/developer-guide/cmake for documentation
6
7-cmake_minimum_required (VERSION 2.6)
8-cmake_policy (VERSION 2.6)
9+cmake_minimum_required (VERSION 2.8)
10+cmake_policy (VERSION 2.8)
11 project (scratch)
12 enable_testing ()
13 set (DATADIR "${CMAKE_INSTALL_PREFIX}/share/scratch")
14@@ -16,6 +16,15 @@
15 set (DOLLAR "$")
16 list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
17
18+# Add 'make dist' command for creating release tarball
19+set (CPACK_PACKAGE_VERSION ${VERSION})
20+set (CPACK_SOURCE_GENERATOR "TGZ")
21+set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
22+set (CPACK_SOURCE_IGNORE_FILES "/build/;/.bzr/;/.bzrignore;~$;${CPACK_SOURCE_IGNORE_FILES}")
23+
24+include (CPack)
25+add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
26+
27 # Some configuration
28 configure_file (${CMAKE_SOURCE_DIR}/src/config.vala.cmake ${CMAKE_SOURCE_DIR}/src/config.vala)
29 configure_file (${CMAKE_SOURCE_DIR}/src/scratch.pc.cmake ${CMAKE_BINARY_DIR}/src/scratch.pc)
30@@ -26,7 +35,7 @@
31 # Vala
32 find_package (Vala REQUIRED)
33 include (ValaVersion)
34-ensure_vala_version ("0.15.1" MINIMUM)
35+ensure_vala_version ("0.16.1" MINIMUM)
36 include (ValaPrecompile)
37
38

Subscribers

People subscribed via source and target branches