Merge branch 'PHP-8.4'

Author: petk

cmake/ext/intl/CMakeLists.txt

@@ -190,12 +190,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "CYGWIN")
   )
 endif()
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-  find_package(ICU 57.1 COMPONENTS io uc in)
-else()
-  find_package(ICU 57.1 COMPONENTS io uc i18n)
-endif()
-
+find_package(ICU 57.1 COMPONENTS i18n io uc)
 set_package_properties(
   ICU
   PROPERTIES
@@ -209,10 +204,7 @@ else()
   target_compile_features(php_ext_intl PRIVATE cxx_std_11)
 endif()
 
-target_link_libraries(
-  php_ext_intl
-  PRIVATE ICU::io ICU::uc $<IF:$<PLATFORM_ID:Windows>,ICU::in,ICU::i18n>
-)
+target_link_libraries(php_ext_intl PRIVATE ICU::i18n ICU::io ICU::uc)
 
 if(ICU_VERSION VERSION_GREATER_EQUAL 60)
   target_compile_definitions(php_ext_intl PRIVATE U_HIDE_OBSOLETE_UTF_OLD_H=1)