Merge lp:~zorba-coders/zorba/extra-module-libs into lp:zorba

Proposed by Chris Hillery on 2012-05-18
Status: Merged
Approved by: Matthias Brantner on 2012-05-18
Approved revision: 10853
Merged at revision: 10855
Proposed branch: lp:~zorba-coders/zorba/extra-module-libs
Merge into: lp:zorba
Diff against target: 25 lines (+2/-2)
2 files modified
cmake_modules/ZorbaModule.cmake (+1/-1)
config/ExternalModuleConfig.cmake.in (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/extra-module-libs
Reviewer Review Type Date Requested Status
Matthias Brantner 2012-05-18 Approve on 2012-05-18
Chris Hillery Approve on 2012-05-18
Review via email: mp+106346@code.launchpad.net

Commit Message

Allow modules to specify their own libs for their Config file, in addition to the automatically-added libs from DECLARE_ZORBA_MODULE().

To post a comment you must log in.
Chris Hillery (ceejatec) :
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job extra-module-libs-2012-05-18T18-28-08.795Z is finished. The final status was:

All tests succeeded!

Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending.

review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job extra-module-libs-2012-05-18T19-02-59.372Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake_modules/ZorbaModule.cmake'
2--- cmake_modules/ZorbaModule.cmake 2012-05-03 12:31:51 +0000
3+++ cmake_modules/ZorbaModule.cmake 2012-05-18 10:59:19 +0000
4@@ -684,7 +684,7 @@
5 # Generate project's projectConfig.cmake file.
6 # QQQ need to create an installable version of this too, once we know
7 # how installing a module package should work.
8- GET_PROPERTY (ZORBA_PROJECT_LIBRARIES
9+ GET_PROPERTY (ZORBA_MODULE_LIBRARIES
10 GLOBAL PROPERTY "${PROJECT_NAME}_LIBRARIES")
11 CONFIGURE_FILE("${Zorba_EXTERNALMODULECONFIG_FILE}"
12 "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" @ONLY)
13
14=== modified file 'config/ExternalModuleConfig.cmake.in'
15--- config/ExternalModuleConfig.cmake.in 2012-05-03 12:31:51 +0000
16+++ config/ExternalModuleConfig.cmake.in 2012-05-18 10:59:19 +0000
17@@ -26,7 +26,7 @@
18 "${DEPENDENCY_MODULE_PATH}${PATH_SEP}@PROJECT_BINARY_DIR@/URI_PATH/${PATH_SEP}${DEPENDENCY_LIB_PATH}${PATH_SEP}@PROJECT_BINARY_DIR@/LIB_PATH/")
19
20 # Dynamic libraries created by this project to link against
21-SET (@PROJECT_NAME@_LIBRARIES @ZORBA_PROJECT_LIBRARIES@)
22+SET (@PROJECT_NAME@_LIBRARIES @ZORBA_PROJECT_LIBRARIES@ @ZORBA_MODULE_LIBRARIES@)
23
24 # Include directories exported by this project
25 SET (@PROJECT_NAME@_INCLUDE_DIRS @ZORBA_PROJECT_INCLUDE_DIRS@)

Subscribers

People subscribed via source and target branches