More OS X build changes

Also it fixes previus "OSX build change" commit - new script had wrong permissions

Author: lawrinn

CMakeLists.txt

@@ -321,7 +321,7 @@ ELSE()
   ADD_LIBRARY(${LIBRARY_NAME} SHARED ${MARIADB_ODBC_SOURCES} maodbcu.rc)
 
   IF(APPLE)
-    SET(MAODBC_INSTALL_RPATH "${ODBC_LIB_DIR}" "/usr/local/opt/libiodbc" "/usr/local/iODBC/lib")
+    SET(MAODBC_INSTALL_RPATH "${ODBC_LIB_DIR}" "./" "/usr/local/opt/libiodbc" "/usr/local/iODBC/lib" "/usr/local/opt/[email protected]/lib" "/usr/local/opt/libressl/lib")
     SET_TARGET_PROPERTIES(${LIBRARY_NAME}
                           PROPERTIES LINK_FLAGS "-Wl"
                                      INSTALL_RPATH_USE_LINK_PATH 0

osxinstall/CMakeLists.txt

@@ -22,9 +22,13 @@ SET(PRODUCT_SERIES "${MARIADB_ODBC_VERSION_MAJOR}.${MARIADB_ODBC_VERSION_MINOR}"
 SET(PRODUCT_IDENTIFIER "com.mariadb.connector.odbc")
 
 IF(${revno})
-  SET(PKG_PACKAGE "mariadb-connector-odbc-${PRODUCT_VERSION}-r${revno}-osx-${PLATFORM}.pkg")
+  SET(PKG_PACKAGE "mariadb-connector-odbc-${PRODUCT_VERSION}-r${revno}-osx-${CMAKE_SYSTEM_PROCESSOR}.pkg")
 ELSE()
-  SET(PKG_PACKAGE "mariadb-connector-odbc-${PRODUCT_VERSION}-osx-${PLATFORM}.pkg")
+  IF(${PACKAGE_PLATFORM_SUFFIX})
+    SET(PKG_PACKAGE "mariadb-connector-odbc-${PRODUCT_VERSION}-osx-${CMAKE_SYSTEM_PROCESSOR}-${PACKAGE_PLATFORM_SUFFIX}.pkg")
+  ELSE()
+    SET(PKG_PACKAGE "mariadb-connector-odbc-${PRODUCT_VERSION}-osx-${CMAKE_SYSTEM_PROCESSOR}.pkg")
+  ENDIF()
 ENDIF()
 
 MESSAGE(STATUS "PKG package file name ${PKG_PACKAGE}")

osxpostbuild.sh

@@ -23,3 +23,10 @@ echo $1
 LinkedLibName=`otool -L $1 | grep -i iodbcinst | sed 's/	//' | sed 's/ [(].*$//'`
 echo $LinkedLibName
 install_name_tool -change $LinkedLibName @rpath/libiodbcinst.dylib $1
+LinkedLibName=`otool -L $1 | grep -i libssl | sed 's/	//' | sed 's/ [(].*$//'`
+echo $LinkedLibName
+#install_name_tool -change $LinkedLibName @rpath/libssl.1.1.dylib $1
+LinkedLibName=`otool -L $1 | grep -i libcrypto | sed 's/	//' | sed 's/ [(].*$//'`
+echo $LinkedLibName
+#install_name_tool -change $LinkedLibName @rpath/libcrypto.1.1.dylib $1
+