Skip to content

Commit 3e68850

Browse files
committed
Revert Windows ICU component names
The find module already takes care of naming mismatches and the i18n name can be used on all platforms.
1 parent 8e7b654 commit 3e68850

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

cmake/ext/intl/CMakeLists.txt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "CYGWIN")
190190
)
191191
endif()
192192

193-
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
194-
find_package(ICU 50.1 COMPONENTS io uc in)
195-
else()
196-
find_package(ICU 50.1 COMPONENTS io uc i18n)
197-
endif()
198-
193+
find_package(ICU 50.1 COMPONENTS i18n io uc)
199194
set_package_properties(
200195
ICU
201196
PROPERTIES
@@ -209,10 +204,7 @@ else()
209204
target_compile_features(php_ext_intl PRIVATE cxx_std_11)
210205
endif()
211206

212-
target_link_libraries(
213-
php_ext_intl
214-
PRIVATE ICU::io ICU::uc $<IF:$<PLATFORM_ID:Windows>,ICU::in,ICU::i18n>
215-
)
207+
target_link_libraries(php_ext_intl PRIVATE ICU::i18n ICU::io ICU::uc)
216208

217209
if(ICU_VERSION VERSION_GREATER_EQUAL 60)
218210
target_compile_definitions(php_ext_intl PRIVATE U_HIDE_OBSOLETE_UTF_OLD_H=1)

0 commit comments

Comments
 (0)