← Back to team overview

zorba-coders team mailing list archive

[Merge] lp:~zorba-coders/zorba/http-client-module-installers into lp:zorba/http-client-module

 

Chris Hillery has proposed merging lp:~zorba-coders/zorba/http-client-module-installers into lp:zorba/http-client-module.

Requested reviews:
  Zorba Coders (zorba-coders)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/http-client-module-installers/+merge/118222
-- 
https://code.launchpad.net/~zorba-coders/zorba/http-client-module-installers/+merge/118222
Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/http-client-module-installers into lp:zorba/http-client-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-08-10 14:04:42 +0000
+++ CMakeLists.txt	2012-08-04 00:15:24 +0000
@@ -23,8 +23,10 @@
 FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}")
 INCLUDE ("${Zorba_USE_FILE}")
 
-FIND_PACKAGE(zorba_data-converters_module REQUIRED
-  HINTS ${DATA_CONVERTERS_BUILD_DIR})
+IF(NOT SUPPRESS_HTML_MODULE_FIND_PACKAGE)
+  FIND_PACKAGE(zorba_html_module REQUIRED
+    HINTS ${DATA_CONVERTERS_BUILD_DIR})
+ENDIF(NOT SUPRESS_HTML_MODULE_FIND_PACKAGE)
 
 ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test")
 ADD_SUBDIRECTORY("src")


Follow ups