diff options
| author | Jan Vorlicek <janvorli@microsoft.com> | 2017-03-07 01:35:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-07 01:35:14 +0100 |
| commit | dc22420af24474fc500cbb47d289337b1762b23d (patch) | |
| tree | 9a79426b08325325af82391da4e4b9c038f2970e /src | |
| parent | d67517364d978ab233ed767020c9581b44f8dc75 (diff) | |
| download | coreclr-dc22420af24474fc500cbb47d289337b1762b23d.tar.gz coreclr-dc22420af24474fc500cbb47d289337b1762b23d.tar.bz2 coreclr-dc22420af24474fc500cbb47d289337b1762b23d.zip | |
Fix ICU detection in System.Globalization.Native build (#9990)
The config.cmake was not getting the ICU library paths it requires to
build a code that detects presence of the ucol_setMaxVariable.
I have excluded the libraries detection from the CMakeLists.txt
some time ago since they are not used in the build itself anymore,
but I have not realized that they are needed for this detection
script that's included from the CMakeLists.txt.
Diffstat (limited to 'src')
| -rw-r--r-- | src/corefx/System.Globalization.Native/CMakeLists.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corefx/System.Globalization.Native/CMakeLists.txt b/src/corefx/System.Globalization.Native/CMakeLists.txt index 1d6343200d..60ef5e8535 100644 --- a/src/corefx/System.Globalization.Native/CMakeLists.txt +++ b/src/corefx/System.Globalization.Native/CMakeLists.txt @@ -14,7 +14,7 @@ if(UTYPES_H STREQUAL UTYPES_H-NOTFOUND) return() endif() -if (FEATURE_FIXED_ICU_VERSION AND NOT CLR_CMAKE_PLATFORM_DARWIN) +if (NOT CLR_CMAKE_PLATFORM_DARWIN) find_library(ICUUC icuuc) if(ICUUC STREQUAL ICUUC-NOTFOUND) message(FATAL_ERROR "Cannot find libicuuc, try installing libicu-dev (or the appropriate package for your platform)") @@ -26,9 +26,7 @@ if (FEATURE_FIXED_ICU_VERSION AND NOT CLR_CMAKE_PLATFORM_DARWIN) message(FATAL_ERROR "Cannot find libicui18n, try installing libicu-dev (or the appropriate package for your platform)") return() endif() -endif() - -if(CLR_CMAKE_PLATFORM_DARWIN) +else() find_library(ICUCORE icucore) if(ICUI18N STREQUAL ICUCORE-NOTFOUND) message(FATAL_ERROR "Cannot find libicucore, skipping build for System.Globalization.Native. .NET globalization is not expected to function.") |