Merge lp:~midori/midori/cmake-make-dist into lp:midori

Proposed by Cody Garver
Status: Needs review
Proposed branch: lp:~midori/midori/cmake-make-dist
Merge into: lp:midori
Diff against target: 19 lines (+9/-0)
1 file modified
CMakeLists.txt (+9/-0)
To merge this branch: bzr merge lp:~midori/midori/cmake-make-dist
Reviewer Review Type Date Requested Status
Midori Devs Pending
Review via email: mp+272211@code.launchpad.net

Description of the change

I recommend TXZ compression instead of TBZ2. But TXZ only works with CMake >= 3.1.0.

I did not bump the required cmake version to avoid build failures on Ubuntu Trusty for the sake of this feature.

To post a comment you must log in.

Unmerged revisions

7039. By Cody Garver

Add 'make dist' command for creating release tarball

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 2015-08-30 10:19:52 +0000
3+++ CMakeLists.txt 2015-09-24 08:52:06 +0000
4@@ -34,6 +34,15 @@
5 endif ()
6 add_definitions("-DPACKAGE_VERSION=\"${VERSION}\"")
7
8+# Add 'make dist' command for creating release tarball
9+set (CPACK_PACKAGE_VERSION ${VERSION})
10+set (CPACK_SOURCE_GENERATOR "TXZ")
11+set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
12+set (CPACK_SOURCE_IGNORE_FILES "/build/;/tools/;/.bzr/;/.bzrignore;~$;${CPACK_SOURCE_IGNORE_FILES}")
13+
14+include (CPack)
15+add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
16+
17 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
18 # Disallow building during install to avoid permission problems
19 set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY 1)

Subscribers

People subscribed via source and target branches

to all changes: