blob: 163a47f988647ee28b255f2ad8ec1cedd5648585 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c0b074..8893e1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,8 +85,12 @@ include(FindPythonModule)
find_package(ACL)
if(ACL_FOUND)
check_library_exists("${ACL_LIBRARY}" acl_extended_file "" HAVE_ACL_EXTENDED_FILE)
- check_include_file(acl/libacl.h HAVE_ACL_LIBACL_H)
- check_include_file(sys/acl.h HAVE_SYS_ACL_H)
+ if(EXISTS "${ACL_INCLUDE_DIR}/acl/libacl.h")
+ set(HAVE_ACL_LIBACL_H 1)
+ endif()
+ if(EXISTS "${ACL_INCLUDE_DIR}/sys/acl.h")
+ set(HAVE_SYS_ACL_H 1)
+ endif()
endif()
find_package(Blkid)
diff --git a/cmake/FindACL.cmake b/cmake/FindACL.cmake
index a41f2c1..9675498 100644
--- a/cmake/FindACL.cmake
+++ b/cmake/FindACL.cmake
@@ -12,7 +12,7 @@ libfind_pkg_check_modules(ACL_PKGCONF libacl)
# Include dir
find_path(ACL_INCLUDE_DIR
- NAMES "acl/libacl.h" "sys/libacl.h"
+ NAMES "acl/libacl.h" "sys/acl.h"
PATHS ${ACL_PKGCONF_INCLUDE_DIRS}
)
diff --git a/cmake/FindGCrypt.cmake b/cmake/FindGCrypt.cmake
index 00fc4b3..d7997f6 100644
--- a/cmake/FindGCrypt.cmake
+++ b/cmake/FindGCrypt.cmake
@@ -18,6 +18,10 @@
#=============================================================================
#
+find_package(PkgConfig)
+pkg_check_modules(GCRYPT libgcrypt)
+set(GCRYPT_LIBRARIES "${GCRYPT_LINK_LIBRARIES}")
+
if (GCRYPT_LIBRARIES AND GCRYPT_INCLUDE_DIRS)
# in cache already
# set(GCRYPT_FOUND TRUE)
|
