Skip to content

Commit

Permalink
cmake: require OpenSSL
Browse files Browse the repository at this point in the history
With the new TLS-PSK features in bareos 18 we require OpenSSL for building

Cmake now emits a fatal error when OpenSSL is not found.
  • Loading branch information
pstorz authored and franku committed Dec 17, 2018
1 parent 8c75167 commit ee6971e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 4 additions & 2 deletions core/CMakeLists.txt
@@ -1,6 +1,6 @@
# BAREOS�� - Backup Archiving REcovery Open Sourced
#
# Copyright (C) 2017-2017 Bareos GmbH & Co. KG
# Copyright (C) 2017-2018 Bareos GmbH & Co. KG
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of version three of the GNU Affero General Public
Expand Down Expand Up @@ -73,7 +73,9 @@ INCLUDE(BareosExtractVersionInfo)

INCLUDE(BareosFindAllLibraries)


IF (NOT ${OPENSSL_FOUND})
MESSAGE(FATAL_ERROR "FATAL ERROR: OpenSSL is required but was not found.")
ENDIF()


IF (coverage)
Expand Down
3 changes: 1 addition & 2 deletions core/cmake/BareosFindAllLibraries.cmake
@@ -1,6 +1,6 @@
# BAREOS�� - Backup Archiving REcovery Open Sourced
#
# Copyright (C) 2017-2017 Bareos GmbH & Co. KG
# Copyright (C) 2017-2018 Bareos GmbH & Co. KG
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of version three of the GNU Affero General Public
Expand Down Expand Up @@ -45,7 +45,6 @@ if (${OPENSSL_FOUND})
SET(HAVE_OPENSSL 1)
endif()


INCLUDE(BareosFindLibraryAndHeaders)

BareosFindLibraryAndHeaders("fastlz" "fastlzlib.h")
Expand Down

0 comments on commit ee6971e

Please sign in to comment.