Skip to content

Commit a0eee1d

Browse files
petkpetk
committed
Rename php_configuration target to php_config
1 parent 985011c commit a0eee1d

20 files changed

+112
-112
lines changed

‎cmake/Zend/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ target_sources(
293293
$<$<NOT:$<PLATFORM_ID:Windows>>:${CMAKE_CURRENT_BINARY_DIR}/zend_config.h>
294294
)
295295

296-
target_link_libraries(zend PRIVATE PHP::configuration)
296+
target_link_libraries(zend PRIVATE PHP::config)
297297

298298
target_include_directories(
299299
zend
@@ -324,20 +324,20 @@ set_target_properties(
324324

325325
# Cleaner COMPILE_ONLY generator expression is available in CMake >= 3.27.
326326
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.27)
327-
target_link_libraries(php_configuration INTERFACE $<COMPILE_ONLY:Zend::Zend>)
327+
target_link_libraries(php_config INTERFACE $<COMPILE_ONLY:Zend::Zend>)
328328
else()
329329
target_compile_definitions(
330-
php_configuration
330+
php_config
331331
INTERFACE
332332
$<TARGET_PROPERTY:Zend::Zend,INTERFACE_COMPILE_DEFINITIONS>
333333
)
334334
target_compile_options(
335-
php_configuration
335+
php_config
336336
INTERFACE
337337
$<TARGET_PROPERTY:Zend::Zend,INTERFACE_COMPILE_OPTIONS>
338338
)
339339
target_include_directories(
340-
php_configuration
340+
php_config
341341
INTERFACE
342342
$<TARGET_PROPERTY:Zend::Zend,INTERFACE_INCLUDE_DIRECTORIES>
343343
$<TARGET_PROPERTY:Zend::Zend,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>

‎cmake/cmake/Bootstrap.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ include(PHP/InterproceduralOptimization)
3434
include(PHP/PositionIndependentCode)
3535

3636
# INTERFACE library with usage requirements.
37-
add_library(php_configuration INTERFACE)
38-
add_library(PHP::configuration ALIAS php_configuration)
37+
add_library(php_config INTERFACE)
38+
add_library(PHP::config ALIAS php_config)
3939
target_include_directories(
40-
php_configuration
40+
php_config
4141
INTERFACE
4242
${PHP_BINARY_DIR}
4343
${PHP_SOURCE_DIR}
@@ -46,7 +46,7 @@ target_include_directories(
4646
# INTERFACE library that ties objects and configuration together for PHP SAPIs.
4747
add_library(php_sapi INTERFACE)
4848
add_library(PHP::SAPI ALIAS php_sapi)
49-
target_link_libraries(php_sapi INTERFACE PHP::configuration)
49+
target_link_libraries(php_sapi INTERFACE PHP::config)
5050

5151
# Create a custom target for generating files (parsers, lexers, etc.) manually:
5252
# cmake --build <dir> -t php_generate_files

‎cmake/cmake/BuildTypes.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ foreach(lang C CXX ASM)
6262
endforeach()
6363

6464
target_compile_definitions(
65-
php_configuration
65+
php_config
6666
INTERFACE
6767
$<IF:$<CONFIG:Debug,DebugAssertions>,ZEND_DEBUG=1,ZEND_DEBUG=0>
6868
)

‎cmake/cmake/Configuration.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,13 +181,13 @@ block()
181181
if(NOT PHP_EXTENSION_DIR)
182182
set(
183183
extensionDir
184-
"${CMAKE_INSTALL_LIBDIR}/php/$<TARGET_PROPERTY:Zend::Zend,ZEND_MODULE_API_NO>$<$<BOOL:$<TARGET_PROPERTY:php_configuration,PHP_THREAD_SAFETY>>:-zts>$<$<BOOL:$<CONFIG>>:-$<CONFIG>>"
184+
"${CMAKE_INSTALL_LIBDIR}/php/$<TARGET_PROPERTY:Zend::Zend,ZEND_MODULE_API_NO>$<$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>:-zts>$<$<BOOL:$<CONFIG>>:-$<CONFIG>>"
185185
)
186186

187187
# This would resemble the PHP Autotools --with-layout=GNU:
188-
#set(extensionDir "${CMAKE_INSTALL_LIBDIR}/php/$<TARGET_PROPERTY:Zend::Zend,ZEND_MODULE_API_NO>$<$<BOOL:$<TARGET_PROPERTY:php_configuration,PHP_THREAD_SAFETY>>:-zts>$<$<CONFIG:Debug,DebugAssertions>:-debug>")
188+
#set(extensionDir "${CMAKE_INSTALL_LIBDIR}/php/$<TARGET_PROPERTY:Zend::Zend,ZEND_MODULE_API_NO>$<$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>:-zts>$<$<CONFIG:Debug,DebugAssertions>:-debug>")
189189
# This would resemble the PHP Autotools --with-layout=PHP (default):
190-
#set(extensionDir "${CMAKE_INSTALL_LIBDIR}/php/extensions/$<IF:$<CONFIG:Debug,DebugAssertions>,debug,no-debug>$<IF:$<BOOL:$<TARGET_PROPERTY:php_configuration,PHP_THREAD_SAFETY>>,-zts,-non-zts>-$<TARGET_PROPERTY:Zend::Zend,ZEND_MODULE_API_NO>")
190+
#set(extensionDir "${CMAKE_INSTALL_LIBDIR}/php/extensions/$<IF:$<CONFIG:Debug,DebugAssertions>,debug,no-debug>$<IF:$<BOOL:$<TARGET_PROPERTY:PHP::config,PHP_THREAD_SAFETY>>,-zts,-non-zts>-$<TARGET_PROPERTY:Zend::Zend,ZEND_MODULE_API_NO>")
191191

192192
set_property(CACHE PHP_EXTENSION_DIR PROPERTY VALUE "${extensionDir}")
193193
endif()

‎cmake/cmake/ConfigureChecks.cmake‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ endif()
400400
include(PHP/CheckGetaddrinfo)
401401
if(TARGET PHP::CheckGetaddrinfoLibrary)
402402
target_link_libraries(
403-
php_configuration
403+
php_config
404404
INTERFACE
405405
PHP::CheckGetaddrinfoLibrary
406406
)
@@ -424,7 +424,7 @@ message(CHECK_START "Checking file descriptor sets size")
424424
if(PHP_FD_SETSIZE MATCHES "^[0-9]+$" AND PHP_FD_SETSIZE GREATER 0)
425425
message(CHECK_PASS "using FD_SETSIZE=${PHP_FD_SETSIZE}")
426426
target_compile_definitions(
427-
php_configuration
427+
php_config
428428
INTERFACE
429429
$<$<COMPILE_LANGUAGE:ASM,C,CXX>:FD_SETSIZE=${PHP_FD_SETSIZE}>
430430
)
@@ -500,7 +500,7 @@ php_check_variable_attribute(aligned HAVE_ATTRIBUTE_ALIGNED)
500500

501501
include(PHP/CheckGethostbynameR)
502502
if(TARGET PHP::CheckGethostbynameR)
503-
target_link_libraries(php_configuration INTERFACE PHP::CheckGethostbynameR)
503+
target_link_libraries(php_config INTERFACE PHP::CheckGethostbynameR)
504504
endif()
505505

506506
################################################################################
@@ -512,21 +512,21 @@ php_search_libraries(
512512
HEADERS dlfcn.h
513513
LIBRARIES ${CMAKE_DL_LIBS}
514514
VARIABLE HAVE_LIBDL
515-
TARGET php_configuration INTERFACE
515+
TARGET php_config INTERFACE
516516
)
517517

518518
php_search_libraries(
519519
sin
520520
HEADERS math.h
521521
LIBRARIES m
522-
TARGET php_configuration INTERFACE
522+
TARGET php_config INTERFACE
523523
)
524524

525525
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64.*")
526526
find_package(Atomic)
527527

528528
if(Atomic_FOUND)
529-
target_link_libraries(php_configuration INTERFACE Atomic::Atomic)
529+
target_link_libraries(php_config INTERFACE Atomic::Atomic)
530530
endif()
531531
endif()
532532

@@ -540,7 +540,7 @@ php_search_libraries(
540540
socket # Solaris <= 11.3, illumos
541541
network # Haiku
542542
ws2_32 # Windows
543-
TARGET php_configuration INTERFACE
543+
TARGET php_config INTERFACE
544544
)
545545

546546
# The socketpair() is mostly in C library (Solaris 11.4...), except Windows.
@@ -551,7 +551,7 @@ php_search_libraries(
551551
socket # Solaris <= 11.3, illumos
552552
network # Haiku
553553
VARIABLE HAVE_SOCKETPAIR
554-
TARGET php_configuration INTERFACE
554+
TARGET php_config INTERFACE
555555
)
556556

557557
# The gethostname() is mostly in C library (Solaris/illumos...)
@@ -564,7 +564,7 @@ php_search_libraries(
564564
network # Haiku
565565
ws2_32 # Windows
566566
VARIABLE HAVE_GETHOSTNAME
567-
TARGET php_configuration INTERFACE
567+
TARGET php_config INTERFACE
568568
)
569569

570570
# The gethostbyaddr() is mostly in C library (Solaris 11.4...)
@@ -578,7 +578,7 @@ php_search_libraries(
578578
nsl # Solaris <= 11.3, illumos
579579
network # Haiku
580580
ws2_32 # Windows
581-
TARGET php_configuration INTERFACE
581+
TARGET php_config INTERFACE
582582
)
583583

584584
# The openpty() can be in C library (Solaris 11.4+, Linux, etc). Solaris <= 11.3
@@ -594,7 +594,7 @@ php_search_libraries(
594594
util # Some BSD-based systems
595595
bsd # Haiku
596596
VARIABLE HAVE_OPENPTY
597-
TARGET php_configuration INTERFACE
597+
TARGET php_config INTERFACE
598598
)
599599

600600
# The inet_ntoa() is mostly in C library (Solaris 11.4, illumos...)
@@ -605,7 +605,7 @@ php_search_libraries(
605605
nsl # Solaris <= 11.3
606606
network # Haiku
607607
VARIABLE HAVE_INET_NTOA
608-
TARGET php_configuration INTERFACE
608+
TARGET php_config INTERFACE
609609
)
610610

611611
# The inet_ntop() is mostly in C library (Solaris 11.4, illumos, BSD*, Linux...)
@@ -620,7 +620,7 @@ php_search_libraries(
620620
network # Haiku
621621
ws2_32 # Windows
622622
VARIABLE HAVE_INET_NTOP
623-
TARGET php_configuration INTERFACE
623+
TARGET php_config INTERFACE
624624
)
625625
if(NOT HAVE_INET_NTOP)
626626
message(FATAL_ERROR "Cannot find inet_ntop which is required.")
@@ -638,7 +638,7 @@ php_search_libraries(
638638
network # Haiku
639639
ws2_32 # Windows
640640
VARIABLE HAVE_INET_PTON
641-
TARGET php_configuration INTERFACE
641+
TARGET php_config INTERFACE
642642
)
643643

644644
# The inet_aton() is mostly in C library (Solaris 11.4, illumos...)
@@ -653,7 +653,7 @@ php_search_libraries(
653653
resolv # Solaris 2.6..7
654654
network # Haiku
655655
VARIABLE HAVE_INET_ATON
656-
TARGET php_configuration INTERFACE
656+
TARGET php_config INTERFACE
657657
)
658658

659659
# The nanosleep is mostly in C library (Solaris 11, illumos...)
@@ -664,7 +664,7 @@ php_search_libraries(
664664
LIBRARIES
665665
rt # Solaris <= 10
666666
VARIABLE HAVE_NANOSLEEP
667-
TARGET php_configuration INTERFACE
667+
TARGET php_config INTERFACE
668668
)
669669

670670
# The setsockopt() is mostly in C library (Solaris 11.4...)
@@ -678,7 +678,7 @@ php_search_libraries(
678678
socket # Solaris <= 11.3, illumos
679679
network # Haiku
680680
ws2_32 # Windows
681-
TARGET php_configuration INTERFACE
681+
TARGET php_config INTERFACE
682682
)
683683

684684
# The gai_strerror() is mostly in C library (Solaris 11.4...)
@@ -689,7 +689,7 @@ php_search_libraries(
689689
socket # Solaris <= 11.3, illumos
690690
network # Haiku
691691
VARIABLE HAVE_GAI_STRERROR
692-
TARGET php_configuration INTERFACE
692+
TARGET php_config INTERFACE
693693
)
694694

695695
# The getprotobyname() is mostly in C library (Solaris 11.4...)
@@ -703,7 +703,7 @@ php_search_libraries(
703703
network # Haiku
704704
ws2_32 # Windows
705705
VARIABLE HAVE_GETPROTOBYNAME
706-
TARGET php_configuration INTERFACE
706+
TARGET php_config INTERFACE
707707
)
708708

709709
# The getprotobynumber() is mostly in C library (Solaris 11.4...)
@@ -717,7 +717,7 @@ php_search_libraries(
717717
network # Haiku
718718
ws2_32 # Windows
719719
VARIABLE HAVE_GETPROTOBYNUMBER
720-
TARGET php_configuration INTERFACE
720+
TARGET php_config INTERFACE
721721
)
722722

723723
# The getservbyname() is mostly in C library (Solaris 11.4...)
@@ -731,7 +731,7 @@ php_search_libraries(
731731
network # Haiku
732732
ws2_32 # Windows
733733
VARIABLE HAVE_GETSERVBYNAME
734-
TARGET php_configuration INTERFACE
734+
TARGET php_config INTERFACE
735735
)
736736

737737
# The getservbyport() is mostly in C library (Solaris 11.4...)
@@ -745,7 +745,7 @@ php_search_libraries(
745745
network # Haiku
746746
ws2_32 # Windows
747747
VARIABLE HAVE_GETSERVBYPORT
748-
TARGET php_configuration INTERFACE
748+
TARGET php_config INTERFACE
749749
)
750750

751751
# The shutdown() is mostly in C library (Solaris 11.4...)
@@ -759,7 +759,7 @@ php_search_libraries(
759759
network # Haiku
760760
ws2_32 # Windows
761761
VARIABLE HAVE_SHUTDOWN
762-
TARGET php_configuration INTERFACE
762+
TARGET php_config INTERFACE
763763
)
764764

765765
block()
@@ -776,7 +776,7 @@ block()
776776

777777
message(STATUS "Explicitly linking against libgcc (${libgcc_path})")
778778

779-
target_link_libraries(php_configuration INTERFACE ${libgcc_path})
779+
target_link_libraries(php_config INTERFACE ${libgcc_path})
780780
endif()
781781
endblock()
782782

@@ -812,7 +812,7 @@ if(PHP_GCOV)
812812
)
813813

814814
if(TARGET Gcov::Gcov)
815-
target_link_libraries(php_configuration INTERFACE Gcov::Gcov)
815+
target_link_libraries(php_config INTERFACE Gcov::Gcov)
816816
gcov_generate_report()
817817
set(HAVE_GCOV TRUE)
818818
endif()
@@ -832,7 +832,7 @@ if(PHP_VALGRIND)
832832
set(HAVE_VALGRIND TRUE)
833833
endif()
834834

835-
target_link_libraries(php_configuration INTERFACE Valgrind::Valgrind)
835+
target_link_libraries(php_config INTERFACE Valgrind::Valgrind)
836836
endif()
837837
add_feature_info(
838838
"Valgrind"
@@ -865,9 +865,9 @@ if(PHP_DTRACE)
865865
${PHP_SOURCE_DIR}/Zend/zend_execute.c
866866
${PHP_SOURCE_DIR}/Zend/zend.c
867867
INCLUDES
868-
$<TARGET_PROPERTY:PHP::configuration,INTERFACE_INCLUDE_DIRECTORIES>
868+
$<TARGET_PROPERTY:PHP::config,INTERFACE_INCLUDE_DIRECTORIES>
869869
)
870-
target_link_libraries(php_configuration INTERFACE DTrace::DTrace)
870+
target_link_libraries(php_config INTERFACE DTrace::DTrace)
871871
target_link_libraries(php_sapi INTERFACE php_dtrace)
872872

873873
set(HAVE_DTRACE TRUE)
@@ -896,12 +896,12 @@ if(PHP_DMALLOC)
896896
)
897897

898898
target_compile_definitions(
899-
php_configuration
899+
php_config
900900
INTERFACE
901901
$<$<COMPILE_LANGUAGE:ASM,C,CXX>:DMALLOC_FUNC_CHECK>
902902
)
903903

904-
target_link_libraries(php_configuration INTERFACE Dmalloc::Dmalloc)
904+
target_link_libraries(php_config INTERFACE Dmalloc::Dmalloc)
905905

906906
if(Dmalloc_FOUND)
907907
message(CHECK_PASS "yes")

0 commit comments

Comments
 (0)