Skip to content

Add ICU version check to ensure minimum of version 61 is used. #1866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 25, 2019
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
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ find_package(CURL REQUIRED)
find_package(ICU COMPONENTS uc i18n REQUIRED)
find_package(LibXml2 REQUIRED)

set(ICU_MINIMUM_VERSION 61)
if(ICU_VERSION VERSION_LESS ${ICU_MINIMUM_VERSION})
message(FATAL_ERROR "ICU version ${ICU_VERSION} is less than required version ${ICU_MINIMUM_VERSION}")
endif()


include(SwiftSupport)
include(GNUInstallDirs)
include(ExternalProject)
Expand Down
6 changes: 6 additions & 0 deletions CoreFoundation/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,12 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
PRIVATE
${CURL_INCLUDE_DIRS})
find_package(ICU COMPONENTS uc i18n REQUIRED)

set(ICU_MINIMUM_VERSION 61)
if(ICU_VERSION VERSION_LESS ${ICU_MINIMUM_VERSION})
message(FATAL_ERROR "ICU version ${ICU_VERSION} is less than required version ${ICU_MINIMUM_VERSION}")
endif()
message(STATUS "ICU_INCLUDE_DIR: ${ICU_INCLUDE_DIR}")
target_include_directories(CoreFoundation
PRIVATE
${ICU_INCLUDE_DIR})
Expand Down