Merge pull request swiftlang#1746 from drodriguez/cmake-icu-to-core-foundation

Author: swift-ci

CMakeLists.txt

@@ -39,7 +39,7 @@ ExternalProject_Add(CoreFoundation
                       -DCF_ENABLE_LIBDISPATCH=${FOUNDATION_ENABLE_LIBDISPATCH}
                       -DCF_PATH_TO_LIBDISPATCH_SOURCE=${FOUNDATION_PATH_TO_LIBDISPATCH_SOURCE}
                       -DCF_PATH_TO_LIBDISPATCH_BUILD=${FOUNDATION_PATH_TO_LIBDISPATCH_BUILD}
-                      -DICU_INCLUDE_DIR=${ICU_INCLUDE_DIR}
+                      -DICU_ROOT=${ICU_ROOT}
                     INSTALL_COMMAND
                       ${CMAKE_COMMAND} -E env --unset=DESTDIR ${CMAKE_COMMAND} --build . --target install)
 ExternalProject_Get_Property(CoreFoundation install_dir)

CoreFoundation/CMakeLists.txt

@@ -1,7 +1,8 @@
 
 cmake_minimum_required(VERSION 3.4.3)
 list(APPEND CMAKE_MODULE_PATH
-     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
+     "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules")
 
 project(CoreFoundation
         VERSION
@@ -355,7 +356,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL Android)
   find_package(ICU COMPONENTS uc i18n REQUIRED)
   target_include_directories(CoreFoundation
                              PRIVATE
-                               ${ICU_INCLUDE_DIR})
+                               ${ICU_INCLUDE_DIRS})
 else()
   target_include_directories(CoreFoundation
                              PRIVATE
@@ -455,4 +456,3 @@ if(CF_ENABLE_LIBDISPATCH)
                                  ${CF_PATH_TO_LIBDISPATCH_SOURCE}/src/BlocksRuntime)
   endif()
 endif()
-