Przeglądaj źródła

HPCC-14996 package all required third party libraries from MacPorts

This should resolve missing depended libraries issue.
xwang2713 9 lat temu
rodzic
commit
49c8bfb435
2 zmienionych plików z 20 dodań i 5 usunięć
  1. 7 0
      cmake_modules/FindLIBXML2.cmake
  2. 13 5
      lib2/CMakeLists.txt

+ 7 - 0
cmake_modules/FindLIBXML2.cmake

@@ -58,6 +58,13 @@ if (NOT LIBXML2_FOUND)
     LIBXML2_LIBRARIES 
     LIBXML2_INCLUDE_DIR
   )
+
+  IF (LIBXML2_FOUND AND APPLE)
+     STRING(REPLACE "libxml2" "liblzma"  LIBXML2_EXTRA "${LIBXML2_LIBRARIES}")
+     STRING(REPLACE "libxml2" "libiconv" LIBXML2_EXTRA2 "${LIBXML2_LIBRARIES}")
+     set (LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} "${LIBXML2_EXTRA}" "${LIBXML2_EXTRA2}" )
+  ENDIF()
+
   MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES)
 ENDIF()
 

+ 13 - 5
lib2/CMakeLists.txt

@@ -23,6 +23,9 @@ if (APPLE)
     list(APPEND DYLIBS ${XALAN_LIBRARIES})
     list(APPEND DYLIBS ${XERCES_LIBRARIES})
     list(APPEND DYLIBS ${BINUTILS_LIBRARIES})
+    list(APPEND DYLIBS ${OPENSSL_LIBRARIES})
+    list(APPEND DYLIBS ${ZLIB_LIBRARIES})
+    list(APPEND DYLIBS ${LIBXML2_LIBRARIES})
 elseif (WIN32)
     #TODO:  Should find these dlls not assume them.
     if (NOT USE_NATIVE_LIBRARIES)
@@ -88,11 +91,6 @@ foreach(dylib ${DYLIBS})
             set(fixupCommand "${fixupCommand}\r\nexecute_process(COMMAND install_name_tool -change \"${dylib_48_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 ".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})")
@@ -103,6 +101,16 @@ foreach(dylib ${DYLIBS})
             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 ()
+
+        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 ()
+
         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})