Chris Hillery has proposed merging lp:~zorba-coders/zorba/oauth-module-installers into lp:zorba/oauth-module.
Requested reviews: Chris Hillery (ceejatec) Juan Zacarias (juan457) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/oauth-module-installers/+merge/118229 -- https://code.launchpad.net/~zorba-coders/zorba/oauth-module-installers/+merge/118229 Your team Zorba Coders is subscribed to branch lp:zorba/oauth-module.
=== modified file 'CMakeLists.txt' --- CMakeLists.txt 2011-08-10 14:04:57 +0000 +++ CMakeLists.txt 2012-08-04 02:30:27 +0000 @@ -23,12 +23,26 @@ FIND_PACKAGE (Zorba REQUIRED HINTS "${ZORBA_BUILD_DIR}") INCLUDE ("${Zorba_USE_FILE}") -FIND_PACKAGE(zorba_data-converters_module REQUIRED - HINTS ${HTTP-CLIENT_BUILD_DIR}) -FIND_PACKAGE(zorba_security_module REQUIRED - HINTS ${SECURITY_BUILD_DIR}) - -ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test") -ADD_SUBDIRECTORY("src") +# The _SUPPRESS variables are a work-around for the Ubuntu packaging process. +IF (NOT SUPPRESS_HTML_MODULE_FIND_PACKAGE) + FIND_PACKAGE(zorba_html_module + HINTS ${HTML_BUILD_DIR}) +ELSE (NOT SUPPRESS_HTML_MODULE_FIND_PACKAGE) + SET (zorba_html_module_FOUND 1) +ENDIF (NOT SUPPRESS_HTML_MODULE_FIND_PACKAGE) + +IF (NOT SUPPRESS_SECURITY_MODULE_FIND_PACKAGE) + FIND_PACKAGE(zorba_security_module + HINTS ${SECURITY_BUILD_DIR}) +ELSE (NOT SUPPRESS_SECURITY_MODULE_FIND_PACKAGE) + SET (zorba_security_module_FOUND 1) +ENDIF (NOT SUPPRESS_SECURITY_MODULE_FIND_PACKAGE) + +IF (zorba_html_module_FOUND AND zorba_security_module_FOUND) + ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test") + ADD_SUBDIRECTORY("src") +ELSE ( zorba_html_module_FOUND AND zorba_security_module_FOUND) + MESSAGE (STATUS "Didn't find Zorba's HTML and Security modules - skipping OAuth module") +ENDIF ( zorba_html_module_FOUND AND zorba_security_module_FOUND) DONE_DECLARING_ZORBA_URIS()
-- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp