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

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

Commit message

Set ZORBA_PROJECT_UNAVAILABLE when OpenSSL 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 :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job security-module-bug-1133260-2013-04-03T14-41-39.118Z 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
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-07-27 03:31:52 +0000
+++ CMakeLists.txt 2013-03-28 01:05:28 +0000
@@ -26,6 +26,7 @@
2626
27 MESSAGE(WARNING "Could not find the OpenSSL library and development headers")27 MESSAGE(WARNING "Could not find the OpenSSL library and development headers")
28 MESSAGE(WARNING "Not building security modules")28 MESSAGE(WARNING "Not building security modules")
29 SET_PROPERTY (GLOBAL PROPERTY ZORBA_PROJECT_UNAVAILABLE 1)
2930
30ELSE (NOT OPENSSL_FOUND)31ELSE (NOT OPENSSL_FOUND)
3132

Subscribers

People subscribed via source and target branches

to all changes: