Zorba

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

  1. html-module-bug-1133260
  2. Merge into html-module
Proposed by Chris Hillery
Status: Merged
Approved by: Juan Zacarias
Approved revision: 89
Merged at revision: 89
Proposed branch: lp:~zorba-coders/zorba/html-module-bug-1133260
Merge into: lp:zorba/html-module
Diff against target: 11 lines (+1/-0)
1 file modified
src/CMakeLists.txt (+1/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/html-module-bug-1133260
Reviewer Review Type Date Requested Status
Juan Zacarias Approve
Chris Hillery Approve
Review via email: mp+155879@code.launchpad.net

Commit message

Set ZORBA_PROPERTY_UNAVAILABLE when libtidy not found.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Juan Zacarias (juan457) :
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/html-module-bug-1133260-2013-04-10T08-02-30.448Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job html-module-bug-1133260-2013-04-10T08-02-30.448Z 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 'src/CMakeLists.txt'
2--- src/CMakeLists.txt 2012-08-04 02:23:35 +0000
3+++ src/CMakeLists.txt 2013-03-28 01:05:27 +0000
4@@ -36,6 +36,7 @@
5 ADD_TEST(zorba_html_module/link_crawler_test_for_compilation "${ZORBA_EXE}" -f -q "${PROJECT_SOURCE_DIR}/test/Queries/link_crawler2.xq2" --compile-only)
6 ELSE (LIBTIDY_FOUND)
7 MESSAGE (STATUS "LibTidy library not found -- if you want to use HTML Tidy functionality please set LIBTIDY_INCLUDE_DIR and LIBTIDY_LIBRARIES cmake parameters.")
8+ SET_PROPERTY (GLOBAL PROPERTY ZORBA_PROJECT_UNAVAILABLE 1)
9 ENDIF (LIBTIDY_FOUND)
10 ENDIF (ZORBA_SUPPRESS_LIBTIDY)
11 MESSAGE (STATUS "")

Subscribers

People subscribed via source and target branches

to all changes: