File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -142,8 +142,8 @@ target_include_directories(
142142include (${PROJECT_SOURCE_DIR } /vendor/nunicode.cmake )
143143include (${PROJECT_SOURCE_DIR } /vendor/sqlite.cmake )
144144
145- if (NOT ${ICU_FOUND} OR "${ICU_VERSION} " VERSION_LESS 62.0)
146- message (STATUS "ICU not found or too old, using builtin." )
145+ if (NOT ${ICU_FOUND} OR "${ICU_VERSION} " VERSION_LESS 62.0 OR MLN_USE_BUILTIN_ICU )
146+ message (STATUS "ICU not found, too old or MLN_USE_BUILTIN_ICU requestd , using builtin." )
147147
148148 set (MLN_USE_BUILTIN_ICU TRUE )
149149 include (${PROJECT_SOURCE_DIR } /vendor/icu.cmake )
@@ -167,7 +167,7 @@ target_link_libraries(
167167 ${WEBP_LIBRARIES}
168168 $<$<NOT :$<BOOL :${MLN_USE_BUILTIN_ICU} >>:ICU ::i18n >
169169 $<$<NOT :$<BOOL :${MLN_USE_BUILTIN_ICU} >>:ICU ::uc >
170- $<$<BOOL :${MLN_USE_BUILTIN_ICU} >:mbgl -vendor -icu >
170+ $<$<BOOL :${MLN_USE_BUILTIN_ICU} >:$< IF :$< BOOL : ${MLN_CORE_INCLUDE_DEPS} >,$< TARGET_OBJECTS : mbgl -vendor -icu >, mbgl - vendor - icu > >
171171 PNG::PNG
172172 mbgl-vendor-nunicode
173173 mbgl-vendor-sqlite
You can’t perform that action at this time.
0 commit comments