zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug-1133260 into lp:zorba.

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

Requested reviews:
  Chris Hillery (ceejatec)
  Juan Zacarias (juan457)
Related bugs:
  Bug #1133260 in Zorba: "EXPath http-client module builds even if libtidy unavailable"
  https://bugs.launchpad.net/zorba/+bug/1133260

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

=== 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)