Zorba

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

  1. bug-fixing
  2. Merge into trunk
Proposed by Matthias Brantner
Status: Merged
Approved by: Matthias Brantner
Approved revision: 10563
Merged at revision: 10563
Proposed branch: lp:~zorba-coders/zorba/bug-fixing
Merge into: lp:zorba
Diff against target: 14 lines (+0/-4)
1 file modified
cmake_modules/ZorbaModule.cmake (+0/-4)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-fixing
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Matthias Brantner Approve
Review via email: mp+83968@code.launchpad.net

Commit message

fix for building modules outside of Zorba

Description of the change

fix for building modules outside of Zorba

To post a comment you must log in.
Revision history for this message
Matthias Brantner (matthias-brantner) :
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-fixing-2011-11-30T15-54-16.325Z/log.html

Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-fixing-2011-11-30T15-54-16.325Z 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-11-11 10:37:11 +0000
3+++ cmake_modules/ZorbaModule.cmake 2011-11-30 15:55:36 +0000
4@@ -676,10 +676,6 @@
5 # ZORBA_XHTML_REQUISITES_PATH - points to the dir containing the html requisites (images, lib, styles, templates dirs)
6 # Zorba_EXE - points to zorba.exe (or zorba.bat)
7 MACRO (ADD_XQDOC_TARGETS)
8- IF(NOT ZORBA_WITH_FILE_ACCESS)
9- MESSAGE(WARNING "Can not build XQDoc documentation because 'File' module is not present")
10- ENDIF()
11-
12 MESSAGE(STATUS "ADD_XQDOC_TARGETS")
13
14 SET(ZORBA_XQDOC_XML_XQ

Subscribers

People subscribed via source and target branches