diff options
Diffstat (limited to 'src/corefx/System.Globalization.Native/CMakeLists.txt')
-rw-r--r-- | src/corefx/System.Globalization.Native/CMakeLists.txt | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/src/corefx/System.Globalization.Native/CMakeLists.txt b/src/corefx/System.Globalization.Native/CMakeLists.txt index 60ef5e8535..55c6854497 100644 --- a/src/corefx/System.Globalization.Native/CMakeLists.txt +++ b/src/corefx/System.Globalization.Native/CMakeLists.txt @@ -32,8 +32,8 @@ else() message(FATAL_ERROR "Cannot find libicucore, skipping build for System.Globalization.Native. .NET globalization is not expected to function.") return() endif() - # On Darwin, we always use the OS provided ICU - SET(FEATURE_FIXED_ICU_VERSION 1) + + add_definitions(-DOSX_ICU_LIBRARY_PATH=\"${ICUCORE}\") endif() include(configure.cmake) @@ -50,14 +50,9 @@ set(NATIVEGLOBALIZATION_SOURCES localeStringData.cpp normalization.cpp timeZoneInfo.cpp + icushim.cpp ) -if (NOT FEATURE_FIXED_ICU_VERSION) - list(APPEND NATIVEGLOBALIZATION_SOURCES - icushim.cpp - ) -endif() - include_directories(${UTYPES_H}) _add_library(System.Globalization.Native @@ -76,21 +71,8 @@ set_target_properties(System.Globalization.Native_Static PROPERTIES OUTPUT_NAME # Disable the "lib" prefix. set_target_properties(System.Globalization.Native PROPERTIES PREFIX "") -if (FEATURE_FIXED_ICU_VERSION) - add_definitions(-DFEATURE_FIXED_ICU_VERSION) -endif() - if(NOT CLR_CMAKE_PLATFORM_DARWIN) - if (FEATURE_FIXED_ICU_VERSION) - target_link_libraries(System.Globalization.Native - ${ICUUC} - ${ICUI18N} - ) - target_link_libraries(System.Globalization.Native_Static - ${ICUUC} - ${ICUI18N} - ) - elseif(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) + if (NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) target_link_libraries(System.Globalization.Native dl ) @@ -100,7 +82,7 @@ if(NOT CLR_CMAKE_PLATFORM_DARWIN) endif() else() target_link_libraries(System.Globalization.Native - ${ICUCORE} + dl ) add_definitions(-DU_DISABLE_RENAMING=1) |