Merge lp:~zorba-coders/zorba/bug-1133260 into lp:zorba

[Chris Hillery]

Support global property ZORBA_PROJECT_UNAVAILABLE so non-core modules can inform Zorba build that they failed to find their dependencies.

[Chris Hillery (ceejatec)]

review: Approve

[Juan Zacarias (juan457)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1133260-2013-04-02T16-20-51.449Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug-1133260 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug-1133260-2013-04-02T16-20-51.449Z is finished. The
  final status was:

  2 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1133260-2013-04-02T17-41-53.452Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1133260-2013-04-02T17-41-53.452Z is finished. The final status was:

All tests succeeded!

=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake	2013-02-26 04:12:43 +0000
+++ cmake_modules/ZorbaModule.cmake	2013-03-28 01:04:27 +0000
@@ -719,13 +719,20 @@
   # Now, do things that should be done at the end of *any* project, not
   # just the top-level project.
 
-  # Generate project's projectConfig.cmake file.
+  # Generate project's projectConfig.cmake file, unless the project told
+  # us not to by setting the global property ZORBA_PROJECT_UNAVAILABLE to true.
   # QQQ need to create an installable version of this too, once we know
   # how installing a module package should work.
-  GET_PROPERTY (ZORBA_MODULE_LIBRARIES
-    GLOBAL PROPERTY "${PROJECT_NAME}_LIBRARIES")
-  CONFIGURE_FILE("${Zorba_EXTERNALMODULECONFIG_FILE}"
-    "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" @ONLY)
+  GET_PROPERTY (_unavailable GLOBAL PROPERTY ZORBA_PROJECT_UNAVAILABLE)
+  IF (NOT _unavailable)
+    GET_PROPERTY (ZORBA_MODULE_LIBRARIES
+      GLOBAL PROPERTY "${PROJECT_NAME}_LIBRARIES")
+    CONFIGURE_FILE("${Zorba_EXTERNALMODULECONFIG_FILE}"
+      "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" @ONLY)
+  ELSE (NOT _unavailable)
+    # Reset this variable so next project will still work
+    SET_PROPERTY (GLOBAL PROPERTY ZORBA_PROJECT_UNAVAILABLE)
+  ENDIF (NOT _unavailable)
 
 ENDMACRO (DONE_DECLARING_ZORBA_URIS)