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

2011-12-05 Thread Chris Hillery 
Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug-check-core-uris 
into lp:zorba.

Requested reviews:
  Chris Hillery (ceejatec)
  Juan Zacarias (juan457)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake	2011-12-05 16:02:16 +
+++ cmake_modules/ZorbaModule.cmake	2011-12-05 20:15:28 +
@@ -524,14 +524,20 @@
 # Targets and dependencies:
 #   ALL depends on check_uris; check_uris depends on check_core_uris;
 #   zorbacmd depends on check_core_uris.
-ADD_CUSTOM_TARGET (check_core_uris 
-  DEPENDS ${_core_output_files} VERBATIM)
 ADD_CUSTOM_TARGET (check_uris ALL
   DEPENDS ${_noncore_output_files} VERBATIM)
-ADD_DEPENDENCIES(check_uris check_core_uris)
-ADD_DEPENDENCIES(zorbacmd check_core_uris)
-SET_TARGET_PROPERTIES(check_core_uris PROPERTIES FOLDER Modules)
 SET_TARGET_PROPERTIES(check_uris PROPERTIES FOLDER Modules)
+# Only create check_core_uris target and associated dependencies if
+# there are any core URIs; there should never be any when building a
+# standalone module project.
+LIST (LENGTH _core_output_files _num_core)
+IF (_num_core GREATER 0)
+  ADD_CUSTOM_TARGET (check_core_uris 
+DEPENDS ${_core_output_files} VERBATIM)
+  ADD_DEPENDENCIES(check_uris check_core_uris)
+  ADD_DEPENDENCIES(zorbacmd check_core_uris)
+  SET_TARGET_PROPERTIES(check_core_uris PROPERTIES FOLDER Modules)
+ENDIF (_num_core GREATER 0)
 SET_PROPERTY (GLOBAL PROPERTY ZORBA_URI_FILES)
 
 #add 'xqdoc' and 'xqdoc-xml' targets

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-check-core-uris into lp:zorba

2011-12-05 Thread Chris Hillery 
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-check-core-uris into lp:zorba

2011-12-05 Thread Juan Zacarias 
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

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

2011-12-05 Thread Chris Hillery 
The proposal to merge lp:~zorba-coders/zorba/bug-check-core-uris into lp:zorba 
has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

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

2011-12-05 Thread Zorba Build Bot 
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
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

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

2011-12-05 Thread Zorba Build Bot 
Validation queue job bug-check-core-uris-2011-12-05T21-19-12.051Z is finished. 
The final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

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

2011-12-05 Thread noreply 
The proposal to merge lp:~zorba-coders/zorba/bug-check-core-uris into lp:zorba 
has been updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-check-core-uris/+merge/84526
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp