HPCC-15414 clean lib2 for lib name changes on Mac OS

Before using install_name_tool 1) call otool to find out dependent lib name
2) find dependent lib name under lib2 directory
Also add fix for JIRA HPCC-16930: add dependent libraries for CBLAS support

cmake_modules/FindCBLAS.cmake

@@ -29,5 +29,32 @@ if(NOT CBLAS_FOUND)
         DEFAULT_MSG
         CBLAS_LIBRARIES 
         CBLAS_INCLUDE_DIR)
+
+    if (APPLE)
+      set(LIB_TO_DO ${CBLAS_LIBRARIES})
+
+      set(CBLAS_DEPS_LIBS "")
+      foreach (lib libquadmath;libgfortran;libgcc_s)
+         message("otool -L ${LIB_TO_DO} | egrep ${lib}(.[0-9]{1,})*.dylib | sed \"s/^[[:space:]]//g\" | cut -d' ' -f1")
+         execute_process(
+           COMMAND bash "-c"  "otool -L \"${LIB_TO_DO}\" | egrep \"${lib}(.[0-9]{1,})*.dylib\" | sed \"s/^[[:space:]]//g\" | cut -d' ' -f1"
+           OUTPUT_VARIABLE otoolOut
+           ERROR_VARIABLE  otoolErr
+           OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+        if (NOT "${otoolErr}" STREQUAL "")
+          message(FATAL_ERROR "Failed to check dependent lib ${lib} for ${LIB_TO_DO}")
+        endif()
+
+        if ("${otoolOut}" STREQUAL "")
+          message(FATAL_ERROR "{$OPENBLAB_LIB} dependencies changed. Run otool -L check manually and update file FindCBLAS.cmake")
+        endif()
+        list(APPEND CBLAS_DEPS_LIBS ${otoolOut})
+        if ("${otoolOut}" MATCHES ".*libgfortran.*")
+          set(LIB_TO_DO "${otoolOut}")
+        endif()
+      endforeach()
+    endif(APPLE)
+
     mark_as_advanced(CBLAS_INCLUDE_DIR CBLAS_LIBRARIES)
 endif()

lib2/CMakeLists.txt

@@ -27,6 +27,7 @@ if (APPLE)
     list(APPEND DYLIBS ${ZLIB_LIBRARIES})
     list(APPEND DYLIBS ${LIBXML2_LIBRARIES})
     list(APPEND DYLIBS ${CBLAS_LIBRARIES})
+    list(APPEND DYLIBS ${CBLAS_DEPS_LIBS})
 elseif (WIN32)
     #TODO:  Should find these dlls not assume them.
     if (NOT USE_NATIVE_LIBRARIES)
@@ -72,56 +73,38 @@ foreach(dylib ${DYLIBS})
     elseif (APPLE)
         install(PROGRAMS "${dylib_path}" DESTINATION lib2)
         get_filename_component(dylib_name_ext ${dylib_path} NAME)
+        get_filename_component(dylib_name_only ${dylib_name_ext} NAME_WE)
 
-        set(fixupCommand "execute_process(COMMAND install_name_tool -change \"${dylib_path}\" \"@loader_path/../lib2/${dylib_name_ext}\" \${file} ERROR_VARIABLE ignore)")
-
-        #TODO:  Should be able resolve alias's to alias's correctly?
-        string(REPLACE ".2.21.dylib" ".2.dylib" dylib_2_path "${dylib_path}")
-        if (NOT "${dylib_2_path}" STREQUAL "${dylib_path}")
-            set(fixupCommand "${fixupCommand}\r\nexecute_process(COMMAND install_name_tool -change \"${dylib_2_path}\" \"@loader_path/../lib2/${dylib_name_ext}\" \${file})")
-        endif ()
-
-        string(REPLACE ".28.0.dylib" ".28.dylib" dylib_28_path "${dylib_path}")
-        if (NOT "${dylib_28_path}" STREQUAL "${dylib_path}")
-            set(fixupCommand "${fixupCommand}\r\nexecute_process(COMMAND install_name_tool -change \"${dylib_28_path}\" \"@loader_path/../lib2/${dylib_name_ext}\" \${file})")
-        endif ()
-
-        string(REPLACE ".48.1.dylib" ".48.dylib" dylib_48_path "${dylib_path}")
-        if (NOT "${dylib_48_path}" STREQUAL "${dylib_path}")
-            set(fixupCommand "${fixupCommand}\r\nexecute_process(COMMAND install_name_tool -change \"${dylib_48_path}\" \"@loader_path/../lib2/${dylib_name_ext}\" \${file})")
-        endif ()
-
-        string(REPLACE ".110.0.dylib" ".dylib" dylib_110_path "${dylib_path}")
-        if (NOT "${dylib_110_path}" STREQUAL "${dylib_path}")
-            set(fixupCommand "${fixupCommand}\r\nexecute_process(COMMAND install_name_tool -change \"${dylib_110_path}\" \"@loader_path/../lib2/${dylib_name_ext}\" \${file})")
-        endif ()
-
-        string(REPLACE ".51.2.dylib" ".51.dylib" dylib_51_path "${dylib_path}")
-        if (NOT "${dylib_51_path}" STREQUAL "${dylib_path}")
-            set(fixupCommand "${fixupCommand}\r\nexecute_process(COMMAND install_name_tool -change \"${dylib_51_path}\" \"@loader_path/../lib2/${dylib_name_ext}\" \${file})")
-        endif ()
-
-        string(REPLACE ".55.1.dylib" ".55.dylib" dylib_55_path "${dylib_path}")
-        if (NOT "${dylib_55_path}" STREQUAL "${dylib_path}")
-            set(fixupCommand "${fixupCommand}\r\nexecute_process(COMMAND install_name_tool -change \"${dylib_55_path}\" \"@loader_path/../lib2/${dylib_name_ext}\" \${file})")
-        endif ()
+        install(CODE "
+           file(GLOB files \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${EXEC_DIR}/*\" \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/*.dylib\" \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/plugins/*.dylib\" \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/lib2/*.dylib\")
+           foreach(file \${files})
+               execute_process(COMMAND bash \"-c\"  \"otool -L \\\"\${file}\\\" | egrep \\\"/${dylib_name_only}(.[0-9]{1,})*.dylib\\\" | sed \\\"s/^[[:space:]]//g\\\" | cut -d' ' -f1\"
+                  OUTPUT_VARIABLE otoolOut
+                  ERROR_VARIABLE  otoolErr
+                  OUTPUT_STRIP_TRAILING_WHITESPACE
+               )
+               if (\"\${otoolOut}\" STREQUAL \"\")
+                  continue()
+               endif()
+               if (NOT \"\${otoolErr}\" STREQUAL \"\")
+                   message(FATAL_ERROR \"Failed to check dependent lib  ${dylib_name_only} for \${file}\")
+               endif()
 
-        string(REPLACE ".1.2.8.dylib" ".1.dylib" dylib_1_path "${dylib_path}")
-        if (NOT "${dylib_1_path}" STREQUAL "${dylib_path}")
-            set(fixupCommand "${fixupCommand}\r\nexecute_process(COMMAND install_name_tool -change \"${dylib_1_path}\" \"@loader_path/../lib2/${dylib_name_ext}\" \${file})")
-        endif ()
+                  set(original_dylib_path \${otoolOut})
 
-        if ("${dylib_path}" MATCHES "^/usr/local/Cellar/.*$")
-            get_filename_component(dylib_dir ${dylib} DIRECTORY)
-            set(dylib_link_path "${dylib_dir}/${dylib_name_ext}")
-            set(fixupCommand "${fixupCommand}\r\nexecute_process(COMMAND install_name_tool -change \"${dylib_link_path}\" \"@loader_path/../lib2/${dylib_name_ext}\" \${file})")
-        endif ()
+                  file(GLOB lib2_dylib \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/lib2/${dylib_name_only}*.dylib\")
+                  if (\"\${otoolOut}\" STREQUAL \"\")
+                      message(FATAL_ERROR \"Cannot find ${dylib_name_only}*.dylib under lib2\")
+                  endif()
+                  get_filename_component(dylib_name_ext \"\${lib2_dylib}\" NAME)
 
-        install(CODE "
-            file(GLOB files \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${EXEC_DIR}/*\" \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/*.dylib\" \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/plugins/*.dylib\" \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/lib2/*.dylib\")
-            foreach(file \${files})
-              ${fixupCommand}
-            endforeach ()
+                  execute_process(
+                      COMMAND install_name_tool -change \"\${original_dylib_path}\" \"@loader_path/../lib2/\${dylib_name_ext}\" \"\${file}\"
+                      OUTPUT_VARIABLE out
+                     ERROR_VARIABLE  err
+                  )
+               endif()
+           endforeach ()
         ")
    endif()
 endforeach(dylib)