Skip to content

Add missing dependencies for gd and lmdb extensions #9638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mszabo-wikia wants to merge 1 commit into from
Closed

Add missing dependencies for gd and lmdb extensions #9638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions CMake/FindLibheif.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
if(LIBHEIF_FOUND)
set(LIBHEIF_FIND_QUIETLY TRUE)
endif()

find_path(LIBHEIF_INCLUDE_DIR
NAMES heif.h
PATH_SUFFIXES libheif
PATHS /usr/include /usr/local/include /usr/pkg/include
)

find_library(LIBHEIF_LIBRARY
NAMES heif
PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
)

if(LIBHEIF_INCLUDE_DIR AND LIBHEIF_LIBRARY)
set(LIBHEIF_FOUND TRUE)
endif()

mark_as_advanced(
LIBHEIF_INCLUDE_DIR
LIBHEIF_LIBRARY
)
17 changes: 17 additions & 0 deletions CMake/FindLmdb.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
if(LMDB_FOUND)
set(LMDB_FIND_QUIETLY TRUE)
endif()

find_path(LMDB_INCLUDE_DIR
NAMES lmdb.h
PATHS /usr/include /usr/local/include /usr/pkg/include
)

find_library(LMDB_LIBRARY
NAMES lmdb
PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
)

if(LMDB_INCLUDE_DIR AND LMDB_LIBRARY)
set(LMDB_FOUND TRUE)
endif()
22 changes: 22 additions & 0 deletions CMake/HHVMExtensionConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,17 @@ function (HHVM_EXTENSION_INTERNAL_HANDLE_LIBRARY_DEPENDENCY extensionID dependen
HHVM_EXTENSION_INTERNAL_ADD_LINK_LIBRARIES(${GMP_LIBRARY})
HHVM_EXTENSION_INTERNAL_ADD_DEFINES("-DHAVE_LIBGMP")
endif()
elseif (${libraryName} STREQUAL "heif")
find_package(Libheif ${requiredVersion} REQUIRED)
if (NOT LIBHEIF_INCLUDE_DIR OR NOT LIBHEIF_LIBRARY)
HHVM_EXTENSION_INTERNAL_SET_FAILED_DEPENDENCY(${extensionID} ${dependencyName})
return()
endif()

if (${addPaths})
HHVM_EXTENSION_INTERNAL_ADD_INCLUDE_DIRS(${LIBHEIF_INCLUDE_DIR})
HHVM_EXTENSION_INTERNAL_ADD_LINK_LIBRARIES(${LIBHEIF_LIBRARY})
endif()
elseif (${libraryName} STREQUAL "iconv")
find_package(Libiconv ${requiredVersion})
if (NOT LIBICONV_INCLUDE_DIR)
Expand Down Expand Up @@ -863,6 +874,17 @@ function (HHVM_EXTENSION_INTERNAL_HANDLE_LIBRARY_DEPENDENCY extensionID dependen
HHVM_EXTENSION_INTERNAL_ADD_LINK_LIBRARIES(${LDAP_LIBRARIES})
HHVM_EXTENSION_INTERNAL_ADD_DEFINES("-DHAVE_LIBLDAP")
endif()
elseif (${libraryName} STREQUAL "lmdb")
find_package(Lmdb ${requiredVersion} REQUIRED)
if (NOT LMDB_INCLUDE_DIR OR NOT LMDB_LIBRARY)
HHVM_EXTENSION_INTERNAL_SET_FAILED_DEPENDENCY(${extensionID} ${dependencyName})
return()
endif()

if (${addPaths})
HHVM_EXTENSION_INTERNAL_ADD_INCLUDE_DIRS(${LMDB_INCLUDE_DIR})
HHVM_EXTENSION_INTERNAL_ADD_LINK_LIBRARIES(${LMDB_LIBRARY})
endif()
elseif (${libraryName} STREQUAL "magickwand")
find_package(LibMagickWand ${requiredVersion})
if (NOT LIBMAGICKWAND_INCLUDE_DIRS OR NOT LIBMAGICKWAND_LIBRARIES OR NOT LIBMAGICKCORE_LIBRARIES)
Expand Down