Various changes to help make install work on OSX catalina

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

cmake_modules/FindICU.cmake

@@ -48,8 +48,8 @@ IF (NOT ICU_FOUND)
 
   if (USE_NATIVE_LIBRARIES)
     # if we didn't find in externals, look in system include path
-    FIND_PATH (ICU_INCLUDE_DIR NAMES unicode/uchar.h)
-    FIND_LIBRARY (ICU_LIBRARIES NAMES icuuc)
+    FIND_PATH (ICU_INCLUDE_DIR PATHS /usr/local/opt/icu4c/include NAMES unicode/uchar.h)
+    FIND_LIBRARY (ICU_LIBRARIES PATHS /usr/local/opt/icu4c/lib NAMES icuuc)
   endif()
 
   if(EXISTS ${ICU_INCLUDE_DIR}/unicode/uchar.h)

lib2/CMakeLists.txt

@@ -18,7 +18,11 @@ cmake_minimum_required(VERSION 2.8)
 PROJECT(lib2)
 
 if (APPLE)
-    set(DYLIBS ${BOOST_REGEX_LIBRARIES})
+    if ("${BOOST_REGEX_LIBRARIES}" STREQUAL "Boost::regex")
+      set(DYLIBS "${Boost_REGEX_LIBRARY_RELEASE}")
+    else()
+      set(DYLIBS "${BOOST_REGEX_LIBRARIES}")
+    endif()
     list(APPEND DYLIBS ${ICU_LIBRARIES})
     list(APPEND DYLIBS ${XALAN_LIBRARIES})
     list(APPEND DYLIBS ${XERCES_LIBRARIES})