diff options
| author | Matt Ellis <matell@microsoft.com> | 2015-08-24 17:44:16 -0700 |
|---|---|---|
| committer | Matt Ellis <matell@microsoft.com> | 2015-09-22 11:50:38 -0700 |
| commit | 87c7b73e23caa73394e29cab7399d18972328d2b (patch) | |
| tree | 98d9b68cd137935b09042586465766b8b9750d66 /src/corefx | |
| parent | 73653cce8c173ac7236ffc015f1256bfbf754ea2 (diff) | |
| download | coreclr-87c7b73e23caa73394e29cab7399d18972328d2b.tar.gz coreclr-87c7b73e23caa73394e29cab7399d18972328d2b.tar.bz2 coreclr-87c7b73e23caa73394e29cab7399d18972328d2b.zip | |
Build System.Native.Globalization on OSX
This requires the 'icu4c' package from homebrew, which can be installed
with `brew install icu4c`.
Diffstat (limited to 'src/corefx')
| -rw-r--r-- | src/corefx/System.Globalization.Native/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | src/corefx/System.Globalization.Native/idna.cpp | 1 | ||||
| -rw-r--r-- | src/corefx/System.Globalization.Native/normalization.cpp | 1 |
3 files changed, 19 insertions, 4 deletions
diff --git a/src/corefx/System.Globalization.Native/CMakeLists.txt b/src/corefx/System.Globalization.Native/CMakeLists.txt index b8524cff44..d6ac954722 100644 --- a/src/corefx/System.Globalization.Native/CMakeLists.txt +++ b/src/corefx/System.Globalization.Native/CMakeLists.txt @@ -6,9 +6,24 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) add_definitions(-DPIC=1) add_definitions(-DBIT64=1) -find_library(ICUUC NAMES icuuc) +set(ICU_HOMEBREW_LIB_PATH "/usr/local/opt/icu4c/lib") +set(ICU_HOMEBREW_INC_PATH "/usr/local/opt/icu4c/include") + +find_library(ICUUC NAMES icuuc PATHS ${ICU_HOMEBREW_LIB_PATH}) if(ICUUC STREQUAL ICUUC-NOTFOUND) - message(WARNING "Cannot find libicuuc, skipping build for System.Globalization.Native. .NET globalization is not expected to function. Try installing libicu-dev (or the appropriate package for your platform)") + message(FATAL_ERROR "Cannot find libicuuc, try installing libicu-dev (or the appropriate package for your platform)") + return() +endif() + +find_library(ICUI18N NAMES icui18n PATHS ${ICU_HOMEBREW_LIB_PATH}) +if(ICUI18N STREQUAL ICUI18N-NOTFOUND) + message(FATAL_ERROR "Cannot find libicui18n, try installing libicu-dev (or the appropriate package for your platform)") + return() +endif() + +find_path(UTYPES_H "unicode/utypes.h" PATHS ${ICU_HOMEBREW_INC_PATH}) +if(UTYPES_H STREQUAL UTYPES_H-NOTFOUND) + message(FATAL_ERROR "Cannont find utypes.h, try installing libicu-dev (or the appropriate package for your platform)") return() endif() @@ -24,6 +39,8 @@ set(NATIVEGLOBALIZATION_SOURCES normalization.cpp ) +include_directories(${UTYPES_H}) + add_library(System.Globalization.Native SHARED ${NATIVEGLOBALIZATION_SOURCES} diff --git a/src/corefx/System.Globalization.Native/idna.cpp b/src/corefx/System.Globalization.Native/idna.cpp index b87ceb0bda..0a97b5a0ca 100644 --- a/src/corefx/System.Globalization.Native/idna.cpp +++ b/src/corefx/System.Globalization.Native/idna.cpp @@ -4,7 +4,6 @@ // #include <stdint.h> -#include <uchar.h> #include <unicode/uidna.h> const uint32_t AllowUnassigned = 0x1; diff --git a/src/corefx/System.Globalization.Native/normalization.cpp b/src/corefx/System.Globalization.Native/normalization.cpp index 688eb72bf5..118968de6c 100644 --- a/src/corefx/System.Globalization.Native/normalization.cpp +++ b/src/corefx/System.Globalization.Native/normalization.cpp @@ -4,7 +4,6 @@ // #include <stdint.h> -#include <uchar.h> #include <unicode/unorm2.h> /* |