Zorba

Merge lp:~zorba-coders/zorba/bug-check-core-uris into lp:zorba

  1. bug-check-core-uris
  2. Merge into trunk
Proposed by Chris Hillery
Status: Merged
Approved by: Chris Hillery
Approved revision: 10573
Merged at revision: 10574
Proposed branch: lp:~zorba-coders/zorba/bug-check-core-uris
Merge into: lp:zorba
Diff against target: 29 lines (+11/-5)
1 file modified
cmake_modules/ZorbaModule.cmake (+11/-5)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-check-core-uris
Reviewer Review Type Date Requested Status
Juan Zacarias Approve
Chris Hillery Approve
Review via email: mp+84526@code.launchpad.net

Commit message

Only create check_core_uris and associated dependencies if there are any core URIs (to prevent creating this target in standalone module projects).

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Juan Zacarias (juan457) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-check-core-uris-2011-12-05T21-19-12.051Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-check-core-uris-2011-12-05T21-19-12.051Z 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 2011-12-05 16:02:16 +0000
3+++ cmake_modules/ZorbaModule.cmake 2011-12-05 20:15:28 +0000
4@@ -524,14 +524,20 @@
5 # Targets and dependencies:
6 # ALL depends on check_uris; check_uris depends on check_core_uris;
7 # zorbacmd depends on check_core_uris.
8- ADD_CUSTOM_TARGET (check_core_uris
9- DEPENDS ${_core_output_files} VERBATIM)
10 ADD_CUSTOM_TARGET (check_uris ALL
11 DEPENDS ${_noncore_output_files} VERBATIM)
12- ADD_DEPENDENCIES(check_uris check_core_uris)
13- ADD_DEPENDENCIES(zorbacmd check_core_uris)
14- SET_TARGET_PROPERTIES(check_core_uris PROPERTIES FOLDER "Modules")
15 SET_TARGET_PROPERTIES(check_uris PROPERTIES FOLDER "Modules")
16+ # Only create check_core_uris target and associated dependencies if
17+ # there are any core URIs; there should never be any when building a
18+ # standalone module project.
19+ LIST (LENGTH _core_output_files _num_core)
20+ IF (_num_core GREATER 0)
21+ ADD_CUSTOM_TARGET (check_core_uris
22+ DEPENDS ${_core_output_files} VERBATIM)
23+ ADD_DEPENDENCIES(check_uris check_core_uris)
24+ ADD_DEPENDENCIES(zorbacmd check_core_uris)
25+ SET_TARGET_PROPERTIES(check_core_uris PROPERTIES FOLDER "Modules")
26+ ENDIF (_num_core GREATER 0)
27 SET_PROPERTY (GLOBAL PROPERTY ZORBA_URI_FILES)
28
29 #add 'xqdoc' and 'xqdoc-xml' targets

Subscribers

People subscribed via source and target branches