Skip to content

Commit

Permalink
ceph: detect ceph_statx symbol instead of ceph_statx.h
Browse files Browse the repository at this point in the history
As cephfs/ceph_statx.h does note exist anymore, we now check for the
symbol ceph_statx instead of checking for the include file
cephfs/ceph_statx.h.

(cherry picked from commit 34c9fd9)
  • Loading branch information
arogge committed Aug 25, 2020
1 parent 579e0b2 commit b562b2b
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions core/cmake/BareosCheckIncludes.cmake
@@ -1,6 +1,6 @@
# BAREOS® - Backup Archiving REcovery Open Sourced
#
# Copyright (C) 2017-2019 Bareos GmbH & Co. KG
# Copyright (C) 2017-2020 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 @@ -104,7 +104,14 @@ CHECK_INCLUDE_FILES(sys/xattr.h HAVE_SYS_XATTR_H)
CHECK_INCLUDE_FILES(api/glfs.h HAVE_API_GLFS_H)

CHECK_INCLUDE_FILES(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H)
CHECK_INCLUDE_FILES("sys/stat.h;cephfs/ceph_statx.h" HAVE_CEPHFS_CEPH_STATX_H)

include(CheckSymbolExists)
include(CMakePushCheckState)
cmake_push_check_state()
set(CMAKE_REQUIRED_LIBRARIES cephfs)
check_symbol_exists(ceph_statx "sys/stat.h;cephfs/libcephfs.h" HAVE_CEPHFS_CEPH_STATX_H)
cmake_pop_check_state()

CHECK_INCLUDE_FILES(rados/librados.h HAVE_RADOS_LIBRADOS_H)
CHECK_INCLUDE_FILES(radosstriper/libradosstriper.h HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H)

Expand Down

0 comments on commit b562b2b

Please sign in to comment.