Merge pull request #1851 from ellismg/icu-remove-c-plus-plus

Remove OSX Homebrew ICU dependency

Author: ellismg

src/corefx/System.Globalization.Native/CMakeLists.txt

@@ -6,36 +6,49 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 add_definitions(-DPIC=1)
 add_definitions(-DBIT64=1)
 
-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(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()
 
-set(CMAKE_REQUIRED_INCLUDES ${ICU_HOMEBREW_INC_PATH})
-CHECK_CXX_SOURCE_COMPILES("
- #include <unicode/dtfmtsym.h>
- int main() { DateFormatSymbols::DtWidthType e = DateFormatSymbols::DtWidthType::SHORT; }
-" HAVE_DTWIDTHTYPE_SHORT) 
+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)")
+        return()
+    endif()
+
+    find_library(ICUI18N icui18n)
+        if(ICUI18N STREQUAL ICUI18N-NOTFOUND)
+        message(FATAL_ERROR "Cannot find libicui18n, try installing libicu-dev (or the appropriate package for your platform)")
+        return()
+    endif()
+
+    set(CMAKE_REQUIRED_INCLUDES ${ICU_HOMEBREW_INC_PATH})
+    CHECK_CXX_SOURCE_COMPILES("
+     #include <unicode/udat.h>
+     int main() { UDateFormatSymbolType e = UDAT_STANDALONE_SHORTER_WEEKDAYS; }
+    " HAVE_UDAT_STANDALONE_SHORTER_WEEKDAYS)
 
-if(HAVE_DTWIDTHTYPE_SHORT)
-    add_definitions(-DHAVE_DTWIDTHTYPE_SHORT=1)
-endif(HAVE_DTWIDTHTYPE_SHORT)
+    if(HAVE_UDAT_STANDALONE_SHORTER_WEEKDAYS)
+        add_definitions(-DHAVE_UDAT_STANDALONE_SHORTER_WEEKDAYS=1)
+    endif(HAVE_UDAT_STANDALONE_SHORTER_WEEKDAYS)
+
+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.")
+        return()
+    endif()
+
+    # libicucore supports UDAT_STANDALONE_SHORTER_WEEKDAYS
+    add_definitions(-DHAVE_UDAT_STANDALONE_SHORTER_WEEKDAYS=1)
+
+endif()
 
 add_compile_options(-fPIC)
 
@@ -61,9 +74,17 @@ add_library(System.Globalization.Native
 # Disable the "lib" prefix.
 set_target_properties(System.Globalization.Native PROPERTIES PREFIX "")
 
-target_link_libraries(System.Globalization.Native
-  ${ICUUC}
-  ${ICUI18N}
-)
+if(NOT CLR_CMAKE_PLATFORM_DARWIN)
+    target_link_libraries(System.Globalization.Native
+        ${ICUUC}
+        ${ICUI18N}
+    )
+else()
+    target_link_libraries(System.Globalization.Native
+        ${ICUCORE}
+    )
+
+    add_definitions(-DU_DISABLE_RENAMING=1)
+endif()
 
 install (TARGETS System.Globalization.Native DESTINATION .)