Compiz Core

Merge lp:~compiz-team/compiz-core/compiz-core.dont_require_version into lp:compiz-core/0.9.5

  1. compiz-core.dont_require_version
  2. Merge into 0.9.5
Proposed by Sam Spilsbury
Status: Merged
Approved by: Jason Smith
Approved revision: 2798
Merged at revision: 2798
Proposed branch: lp:~compiz-team/compiz-core/compiz-core.dont_require_version
Merge into: lp:compiz-core/0.9.5
Diff against target: 20 lines (+9/-1)
1 file modified
cmake/CompizPlugin.cmake (+9/-1)
To merge this branch: bzr merge lp:~compiz-team/compiz-core/compiz-core.dont_require_version
Reviewer Review Type Date Requested Status
Jason Smith (community) Approve
Review via email: mp+73520@code.launchpad.net

Description of the change

Don't require a VERSION file

To post a comment you must log in.
Revision history for this message
Jason Smith (jassmith) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/CompizPlugin.cmake'
2--- cmake/CompizPlugin.cmake 2011-07-13 17:29:00 +0000
3+++ cmake/CompizPlugin.cmake 2011-08-31 12:31:05 +0000
4@@ -425,7 +425,15 @@
5
6 if (NOT COMPIZ_PLUGIN_PACK_BUILD)
7 set (CMAKE_PROJECT_NAME plugin-${plugin})
8- file (READ ${CMAKE_SOURCE_DIR}/VERSION COMPIZ_RELEASE_VERSION LIMIT 12 OFFSET 0)
9+
10+ if (EXISTS ${CMAKE_SOURCE_DIR}/VERSION)
11+ file (READ ${CMAKE_SOURCE_DIR}/VERSION COMPIZ_RELEASE_VERSION LIMIT 12 OFFSET 0)
12+ endif (EXISTS ${CMAKE_SOURCE_DIR}/VERSION)
13+
14+ if (NOT COMPIZ_RELEASE_VERSION)
15+ set (COMPIZ_RELEASE_VERSION "0.0.1-git")
16+ endif (NOT COMPIZ_RELEASE_VERSION)
17+
18 string (STRIP ${COMPIZ_RELEASE_VERSION} COMPIZ_RELEASE_VERSION)
19
20 set (VERSION ${COMPIZ_RELEASE_VERSION})

Subscribers

People subscribed via source and target branches