← Back to team overview

zorba-coders team mailing list archive

[Merge] lp:~zorba-coders/zorba/bug-fixing into lp:zorba

 

Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-fixing into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Chris Hillery (ceejatec)
Related bugs:
  Bug #898208 in Zorba: "building xqdoc on cmake < 2.8"
  https://bugs.launchpad.net/zorba/+bug/898208

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83968

fix for building modules outside of Zorba
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-fixing/+merge/83968
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake	2011-11-11 10:37:11 +0000
+++ cmake_modules/ZorbaModule.cmake	2011-11-30 15:55:36 +0000
@@ -676,10 +676,6 @@
 # ZORBA_XHTML_REQUISITES_PATH - points to the dir containing the html requisites (images, lib, styles, templates dirs)
 # Zorba_EXE - points to zorba.exe (or zorba.bat)
 MACRO (ADD_XQDOC_TARGETS)
-	IF(NOT ZORBA_WITH_FILE_ACCESS)
-		MESSAGE(WARNING "Can not build XQDoc documentation because 'File' module is not present")
-	ENDIF()
-
   MESSAGE(STATUS "ADD_XQDOC_TARGETS")
 
   SET(ZORBA_XQDOC_XML_XQ


Follow ups