Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cmake/Zend/cmake/MaxExecutionTimers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ endif()
if(ZEND_MAX_EXECUTION_TIMERS AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
php_search_libraries(
timer_create
HAVE_TIMER_CREATE
HEADERS time.h
LIBRARIES
rt # Solaris <= 10, older Linux
VARIABLE HAVE_TIMER_CREATE
LIBRARY_VARIABLE libraryForTimerCreate
)

Expand Down
37 changes: 16 additions & 21 deletions cmake/cmake/ConfigureChecks.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -510,16 +510,14 @@ endif()

php_search_libraries(
dlopen
HAVE_LIBDL
HEADERS dlfcn.h
LIBRARIES
${CMAKE_DL_LIBS}
LIBRARIES ${CMAKE_DL_LIBS}
VARIABLE HAVE_LIBDL
TARGET php_configuration INTERFACE
)

php_search_libraries(
sin
HAVE_SIN
HEADERS math.h
LIBRARIES m
TARGET php_configuration INTERFACE
Expand All @@ -536,7 +534,6 @@ endif()
# The socket() is mostly in C library (Solaris 11.4...)
php_search_libraries(
socket
HAVE_SOCKET
HEADERS
sys/socket.h
winsock.h
Expand All @@ -550,31 +547,30 @@ php_search_libraries(
# The socketpair() is mostly in C library (Solaris 11.4...), except Windows.
php_search_libraries(
socketpair
HAVE_SOCKETPAIR
HEADERS sys/socket.h
LIBRARIES
socket # Solaris <= 11.3, illumos
network # Haiku
VARIABLE HAVE_SOCKETPAIR
TARGET php_configuration INTERFACE
)

# The gethostname() is mostly in C library (Solaris/illumos...)
php_search_libraries(
gethostname
HAVE_GETHOSTNAME
HEADERS
unistd.h
winsock.h
LIBRARIES
network # Haiku
ws2_32 # Windows
VARIABLE HAVE_GETHOSTNAME
TARGET php_configuration INTERFACE
)

# The gethostbyaddr() is mostly in C library (Solaris 11.4...)
php_search_libraries(
gethostbyaddr
HAVE_GETHOSTBYADDR
HEADERS
netdb.h
sys/socket.h
Expand All @@ -590,7 +586,6 @@ php_search_libraries(
# and illumos don't have it.
php_search_libraries(
openpty
HAVE_OPENPTY
HEADERS
pty.h
libutil.h # FreeBSD
Expand All @@ -599,24 +594,24 @@ php_search_libraries(
LIBRARIES
util # Some BSD-based systems
bsd # Haiku
VARIABLE HAVE_OPENPTY
TARGET php_configuration INTERFACE
)

# The inet_ntoa() is mostly in C library (Solaris 11.4, illumos...)
php_search_libraries(
inet_ntoa
HAVE_INET_NTOA
HEADERS arpa/inet.h
LIBRARIES
nsl # Solaris <= 11.3
network # Haiku
VARIABLE HAVE_INET_NTOA
TARGET php_configuration INTERFACE
)

# The inet_ntop() is mostly in C library (Solaris 11.4, illumos, BSD*, Linux...)
php_search_libraries(
inet_ntop
HAVE_INET_NTOP
HEADERS
arpa/inet.h
ws2tcpip.h
Expand All @@ -625,6 +620,7 @@ php_search_libraries(
resolv # Solaris 2.6..7
network # Haiku
ws2_32 # Windows
VARIABLE HAVE_INET_NTOP
TARGET php_configuration INTERFACE
)
if(NOT HAVE_INET_NTOP)
Expand All @@ -634,7 +630,6 @@ endif()
# The inet_pton() is mostly in C library (Solaris 11.4, illumos...)
php_search_libraries(
inet_pton
HAVE_INET_PTON
HEADERS
arpa/inet.h
ws2tcpip.h
Expand All @@ -643,13 +638,13 @@ php_search_libraries(
resolv # Solaris 2.6..7
network # Haiku
ws2_32 # Windows
VARIABLE HAVE_INET_PTON
TARGET php_configuration INTERFACE
)

# The inet_aton() is mostly in C library (Solaris 11.4, illumos...)
php_search_libraries(
inet_aton
HAVE_INET_ATON
HEADERS
sys/socket.h
netinet/in.h
Expand All @@ -658,24 +653,24 @@ php_search_libraries(
nsl # Solaris <= 11.3
resolv # Solaris 2.6..7
network # Haiku
VARIABLE HAVE_INET_ATON
TARGET php_configuration INTERFACE
)

# The nanosleep is mostly in C library (Solaris 11, illumos...)
php_search_libraries(
nanosleep
HAVE_NANOSLEEP
HEADERS
time.h
LIBRARIES
rt # Solaris <= 10
VARIABLE HAVE_NANOSLEEP
TARGET php_configuration INTERFACE
)

# The setsockopt() is mostly in C library (Solaris 11.4...)
php_search_libraries(
setsockopt
HAVE_SETSOCKOPT
HEADERS
sys/types.h
sys/socket.h
Expand All @@ -690,81 +685,81 @@ php_search_libraries(
# The gai_strerror() is mostly in C library (Solaris 11.4...)
php_search_libraries(
gai_strerror
HAVE_GAI_STRERROR
HEADERS netdb.h
LIBRARIES
socket # Solaris <= 11.3, illumos
network # Haiku
VARIABLE HAVE_GAI_STRERROR
TARGET php_configuration INTERFACE
)

# The getprotobyname() is mostly in C library (Solaris 11.4...)
php_search_libraries(
getprotobyname
HAVE_GETPROTOBYNAME
HEADERS
netdb.h
winsock.h
LIBRARIES
socket # Solaris <= 11.3, illumos
network # Haiku
ws2_32 # Windows
VARIABLE HAVE_GETPROTOBYNAME
TARGET php_configuration INTERFACE
)

# The getprotobynumber() is mostly in C library (Solaris 11.4...)
php_search_libraries(
getprotobynumber
HAVE_GETPROTOBYNUMBER
HEADERS
netdb.h
winsock.h
LIBRARIES
socket # Solaris <= 11.3, illumos
network # Haiku
ws2_32 # Windows
VARIABLE HAVE_GETPROTOBYNUMBER
TARGET php_configuration INTERFACE
)

# The getservbyname() is mostly in C library (Solaris 11.4...)
php_search_libraries(
getservbyname
HAVE_GETSERVBYNAME
HEADERS
netdb.h
winsock.h
LIBRARIES
socket # Solaris <= 11.3, illumos
network # Haiku
ws2_32 # Windows
VARIABLE HAVE_GETSERVBYNAME
TARGET php_configuration INTERFACE
)

# The getservbyport() is mostly in C library (Solaris 11.4...)
php_search_libraries(
getservbyport
HAVE_GETSERVBYPORT
HEADERS
netdb.h
winsock.h
LIBRARIES
socket # Solaris <= 11.3, illumos
network # Haiku
ws2_32 # Windows
VARIABLE HAVE_GETSERVBYPORT
TARGET php_configuration INTERFACE
)

# The shutdown() is mostly in C library (Solaris 11.4...)
php_search_libraries(
shutdown
HAVE_SHUTDOWN
HEADERS
sys/socket.h
winsock.h
LIBRARIES
socket # Solaris <= 11.3, illumos
network # Haiku
ws2_32 # Windows
VARIABLE HAVE_SHUTDOWN
TARGET php_configuration INTERFACE
)

Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindACL.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindACL

Find the ACL library.

Module defines the following `IMPORTED` target(s):
Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindApache.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindApache

Find the Apache packages and tools.

The Apache development package usually contains Apache header files, the `apr`
Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindAppArmor.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindAppArmor

Find the AppArmor library.

Module defines the following `IMPORTED` target(s):
Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindArgon2.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindArgon2

Find the Argon2 library.

Module defines the following `IMPORTED` target(s):
Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindAspell.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindAspell

Find the GNU Aspell library.

In the past, there was a pspell library, which has been superseded by GNU's
Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindAtomic.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindAtomic

Find the atomic instructions.

Module defines the following `IMPORTED` target(s):
Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindBerkeleyDB.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindBerkeleyDB

Find the Berkeley DB library.

Module defines the following `IMPORTED` target(s):
Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindCapstone.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindCapstone

Find the Capstone library.

Module defines the following `IMPORTED` target(s):
Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindCcache.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindCcache

Find the Ccache compiler cache tool for faster compilation times.

## Result variables
Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindCclient.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindCclient

Find the IMAP c-client library.

Also called UW-IMAP library was once maintained by the Washington University.
Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindCdb.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindCdb

Find the cdb library.

Module defines the following `IMPORTED` target(s):
Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindCrypt.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindCrypt

Find the crypt library and run a set of PHP-specific checks if library works.

The Crypt library can be on some systems part of the standard C library. The
Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindDTrace.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindDtrace

Find DTrace.

## Result variables
Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindDbm.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindDbm

Find the dbm library.

Depending on the system, the dbm library can be part of other libraries as an
Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindDmalloc.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindDmalloc

Find the Dmalloc library.

Module defines the following `IMPORTED` target(s):
Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindEditline.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindEditline

Find the Editline library.

Module defines the following `IMPORTED` target(s):
Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindEnchant.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindEnchant

Find the Enchant library.

Enchant uses different library names based on the version - `enchant-2` for
Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindFFI.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindFFI

Find the FFI library.

Module defines the following `IMPORTED` target(s):
Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindFirebird.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindFirebird

Find the Firebird library.

Module defines the following `IMPORTED` target(s):
Expand Down
2 changes: 2 additions & 0 deletions cmake/cmake/modules/FindFreeTDS.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#[=============================================================================[
# FindFreeTDS

Find the FreeTDS set of libraries.

Module defines the following `IMPORTED` target(s):
Expand Down
Loading
Loading