Skip to content

Commit a4e4df1

Browse files
committed
Add missing dependencies for gd and lmdb extensions
These now require libheif and liblmdb, respectively. Add module files for the new dependencies and update the CMake extension config for them.
1 parent 807c5ae commit a4e4df1

3 files changed

Lines changed: 62 additions & 0 deletions

File tree

CMake/FindLibheif.cmake

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
if(LIBHEIF_FOUND)
2+
set(LIBHEIF_FIND_QUIETLY TRUE)
3+
endif()
4+
5+
find_path(LIBHEIF_INCLUDE_DIR
6+
NAMES heif.h
7+
PATH_SUFFIXES libheif
8+
PATHS /usr/include /usr/local/include /usr/pkg/include
9+
)
10+
11+
find_library(LIBHEIF_LIBRARY
12+
NAMES heif
13+
PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
14+
)
15+
16+
if(LIBHEIF_INCLUDE_DIR AND LIBHEIF_LIBRARY)
17+
set(LIBHEIF_FOUND TRUE)
18+
endif()
19+
20+
mark_as_advanced(
21+
LIBHEIF_INCLUDE_DIR
22+
LIBHEIF_LIBRARY
23+
)

CMake/FindLmdb.cmake

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
if(LMDB_FOUND)
2+
set(LMDB_FIND_QUIETLY TRUE)
3+
endif()
4+
5+
find_path(LMDB_INCLUDE_DIR
6+
NAMES lmdb.h
7+
PATHS /usr/include /usr/local/include /usr/pkg/include
8+
)
9+
10+
find_library(LMDB_LIBRARY
11+
NAMES lmdb
12+
PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
13+
)
14+
15+
if(LMDB_INCLUDE_DIR AND LMDB_LIBRARY)
16+
set(LMDB_FOUND TRUE)
17+
endif()

CMake/HHVMExtensionConfig.cmake

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -780,6 +780,17 @@ function (HHVM_EXTENSION_INTERNAL_HANDLE_LIBRARY_DEPENDENCY extensionID dependen
780780
HHVM_EXTENSION_INTERNAL_ADD_LINK_LIBRARIES(${GMP_LIBRARY})
781781
HHVM_EXTENSION_INTERNAL_ADD_DEFINES("-DHAVE_LIBGMP")
782782
endif()
783+
elseif (${libraryName} STREQUAL "heif")
784+
find_package(Libheif ${requiredVersion} REQUIRED)
785+
if (NOT LIBHEIF_INCLUDE_DIR OR NOT LIBHEIF_LIBRARY)
786+
HHVM_EXTENSION_INTERNAL_SET_FAILED_DEPENDENCY(${extensionID} ${dependencyName})
787+
return()
788+
endif()
789+
790+
if (${addPaths})
791+
HHVM_EXTENSION_INTERNAL_ADD_INCLUDE_DIRS(${LIBHEIF_INCLUDE_DIR})
792+
HHVM_EXTENSION_INTERNAL_ADD_LINK_LIBRARIES(${LIBHEIF_LIBRARY})
793+
endif()
783794
elseif (${libraryName} STREQUAL "iconv")
784795
find_package(Libiconv ${requiredVersion})
785796
if (NOT LIBICONV_INCLUDE_DIR)
@@ -863,6 +874,17 @@ function (HHVM_EXTENSION_INTERNAL_HANDLE_LIBRARY_DEPENDENCY extensionID dependen
863874
HHVM_EXTENSION_INTERNAL_ADD_LINK_LIBRARIES(${LDAP_LIBRARIES})
864875
HHVM_EXTENSION_INTERNAL_ADD_DEFINES("-DHAVE_LIBLDAP")
865876
endif()
877+
elseif (${libraryName} STREQUAL "lmdb")
878+
find_package(Lmdb ${requiredVersion} REQUIRED)
879+
if (NOT LMDB_INCLUDE_DIR OR NOT LMDB_LIBRARY)
880+
HHVM_EXTENSION_INTERNAL_SET_FAILED_DEPENDENCY(${extensionID} ${dependencyName})
881+
return()
882+
endif()
883+
884+
if (${addPaths})
885+
HHVM_EXTENSION_INTERNAL_ADD_INCLUDE_DIRS(${LMDB_INCLUDE_DIR})
886+
HHVM_EXTENSION_INTERNAL_ADD_LINK_LIBRARIES(${LMDB_LIBRARY})
887+
endif()
866888
elseif (${libraryName} STREQUAL "magickwand")
867889
find_package(LibMagickWand ${requiredVersion})
868890
if (NOT LIBMAGICKWAND_INCLUDE_DIRS OR NOT LIBMAGICKWAND_LIBRARIES OR NOT LIBMAGICKCORE_LIBRARIES)

0 commit comments

Comments
 (0)