Unity API

Merge lp:~mhr3/unity-api/full-version-in-pc into lp:unity-api

  1. full-version-in-pc
  2. Merge into trunk
Proposed by Michal Hruby
Status: Merged
Approved by: Michi Henning
Approved revision: 117
Merged at revision: 116
Proposed branch: lp:~mhr3/unity-api/full-version-in-pc
Merge into: lp:unity-api
Diff against target: 36 lines (+4/-5)
3 files modified
data/CMakeLists.txt (+3/-0)
data/libunity-api.pc.in (+1/-1)
src/CMakeLists.txt (+0/-4)
To merge this branch: bzr merge lp:~mhr3/unity-api/full-version-in-pc
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Unity Team Pending
Review via email: mp+199245@code.launchpad.net

Commit message

Expose full version including micro version number in pc file.

Description of the change

Expose full version including micro version number in pc file.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:116
http://jenkins.qa.ubuntu.com/job/unity-api-ci/140/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-trusty-amd64-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-trusty-armhf-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-trusty-i386-ci/14/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/140/rebuild

review: Needs Fixing (continuous-integration)
lp:~mhr3/unity-api/full-version-in-pc updated
117. By Michal Hruby

Remove extra whitespace

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:117
http://jenkins.qa.ubuntu.com/job/unity-api-ci/141/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-trusty-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-trusty-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-trusty-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-trusty-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/141/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2013-11-18 17:34:38 +0000
3+++ data/CMakeLists.txt 2013-12-17 10:18:19 +0000
4@@ -6,3 +6,6 @@
5
6 configure_file(unity-shell-api.pc.in unity-shell-api.pc @ONLY)
7 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-shell-api.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
8+
9+configure_file(lib${UNITY_API_LIB}.pc.in lib${UNITY_API_LIB}.pc @ONLY)
10+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${UNITY_API_LIB}.pc DESTINATION ${LIB_INSTALL_PREFIX}/pkgconfig)
11
12=== renamed file 'src/libunity-api.pc.in' => 'data/libunity-api.pc.in'
13--- src/libunity-api.pc.in 2013-09-25 13:12:27 +0000
14+++ data/libunity-api.pc.in 2013-12-17 10:18:19 +0000
15@@ -22,6 +22,6 @@
16
17 Name: lib@UNITY_API_LIB@
18 Description: Unity API library
19-Version: @UNITY_API_MAJOR@.@UNITY_API_MINOR@
20+Version: @UNITY_API_VERSION@
21 Libs: -L${libdir} -l@UNITY_API_LIB@
22 Cflags: -I${includedir}
23
24=== modified file 'src/CMakeLists.txt'
25--- src/CMakeLists.txt 2013-06-20 07:39:49 +0000
26+++ src/CMakeLists.txt 2013-12-17 10:18:19 +0000
27@@ -31,9 +31,5 @@
28 # Only the dynamic library gets installed.
29 install(TARGETS ${UNITY_API_LIB} LIBRARY DESTINATION ${LIB_INSTALL_PREFIX})
30
31-# Set up package config.
32-configure_file(lib${UNITY_API_LIB}.pc.in lib${UNITY_API_LIB}.pc @ONLY)
33-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${UNITY_API_LIB}.pc DESTINATION ${LIB_INSTALL_PREFIX}/pkgconfig)
34-
35 # Parent needs to know what all the source files are, for generating doc and the like.
36 set(UNITY_API_LIB_SRC ${UNITY_API_LIB_SRC} ${UNITY_SRC} PARENT_SCOPE)

Subscribers

People subscribed via source and target branches

to all changes: