Fix ICU resolve_dependency (facebookincubator#5036)

Summary:
fixes facebookincubator#5022

The fuzzer failures where happenning because `FindICU` apparently requires components to be specified and does not fallback on looking for all. Additionally we really only need icu for Boost (from source) so it makes no sense to always look for it.

Pull Request resolved: facebookincubator#5036

Reviewed By: xiaoxmeng

Differential Revision: D46154393

Pulled By: kgpai

fbshipit-source-id: ee14e46c85bcd0af85d2a9c6c2a49791dc05b672

CMake/resolve_dependency_modules/boost.cmake

@@ -12,8 +12,28 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 include_guard(GLOBAL)
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/boost)
 
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+  if(ON_APPLE_M1)
+    list(APPEND CMAKE_PREFIX_PATH "/opt/homebrew/opt/icu4c")
+  else()
+    list(APPEND CMAKE_PREFIX_PATH "/usr/local/opt/icu4c")
+  endif()
+endif()
+
+# ICU is only needed with Boost build from source
+set_source(ICU)
+resolve_dependency(
+  ICU
+  COMPONENTS
+  data
+  i18n
+  io
+  uc
+  tu
+  test)
+
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/boost)
 if(${ICU_SOURCE} STREQUAL "BUNDLED")
   # ensure ICU is built before Boost
   add_dependencies(boost_regex ICU ICU::i18n)

CMakeLists.txt

@@ -308,17 +308,6 @@ message("FINAL CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}")
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-  if(ON_APPLE_M1)
-    set(CMAKE_PREFIX_PATH "/opt/homebrew/opt/icu4c" ${CMAKE_PREFIX_PATH})
-  else()
-    set(CMAKE_PREFIX_PATH "/usr/local/opt/icu4c" ${CMAKE_PREFIX_PATH})
-  endif()
-endif()
-
-set_source(ICU)
-resolve_dependency(ICU)
-
 set(BOOST_INCLUDE_LIBRARIES
     headers
     atomic