[QGIS Commit] r15011 - in trunk/qgis: cmake mac/cmake

[svn_qgis at osgeo.org]

Author: kyngchaos
Date: 2011-01-09 13:59:02 -0800 (Sun, 09 Jan 2011)
New Revision: 15011

Modified:
   trunk/qgis/cmake/MacBundleMacros.cmake
   trunk/qgis/mac/cmake/2lib.cmake.in
Log:
libpq may link libintl

Modified: trunk/qgis/cmake/MacBundleMacros.cmake
===================================================================
--- trunk/qgis/cmake/MacBundleMacros.cmake	2011-01-09 16:37:25 UTC (rev 15010)
+++ trunk/qgis/cmake/MacBundleMacros.cmake	2011-01-09 21:59:02 UTC (rev 15011)
@@ -10,13 +10,14 @@
 # regex stuff taken from GetPrerequisites
 
 FUNCTION (GET_INSTALL_NAME LIBFILE LIBNAME OUTVAR)
-    EXECUTE_PROCESS (COMMAND otool -D "${LIBFILE}" OUTPUT_VARIABLE iname_out)
+    EXECUTE_PROCESS (COMMAND otool -L "${LIBFILE}" OUTPUT_VARIABLE iname_out)
+    # remove 1st line, it's just path to lib file
     STRING (REGEX REPLACE ".*:\n" "" iname "${iname_out}")
     IF (iname)
-        # trim it
-        STRING (REGEX MATCH "[^\n ].*[^\n ]" iname "${iname}")
-        SET (${OUTVAR} ${iname} PARENT_SCOPE)
+        # find libname
+        STRING (REGEX MATCH "[^\n\t ]*${LIBNAME}[^\n ]*" iname "${iname}")
     ENDIF (iname)
+    SET (${OUTVAR} ${iname} PARENT_SCOPE)
 ENDFUNCTION (GET_INSTALL_NAME)
 
 # message only if verbose makefiles

Modified: trunk/qgis/mac/cmake/2lib.cmake.in
===================================================================
--- trunk/qgis/mac/cmake/2lib.cmake.in	2011-01-09 16:37:25 UTC (rev 15010)
+++ trunk/qgis/mac/cmake/2lib.cmake.in	2011-01-09 21:59:02 UTC (rev 15011)
@@ -97,6 +97,17 @@
     EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "@POSTGRES_LIBRARY@" "${QLIBDIR}/libpq.dylib")
     GET_INSTALL_NAME ("@POSTGRES_LIBRARY@" "libpq" PQLIB)
     UPDATEQGISPATHS (${PQLIB} libpq.dylib)
+    # may have been built with libintl
+    GET_INSTALL_NAME ("@POSTGRES_LIBRARY@" "libintl" INTLLIB)
+    IF (INTLLIB)
+        EXECUTE_PROCESS (COMMAND ditto ${QARCHS} "${INTLLIB}" "${QLIBDIR}/libintl.dylib")
+        SET (LIB_CHG_TO "${ATEXECUTABLE}/@QGIS_LIB_SUBDIR@/libintl.dylib")
+        IF (@OSX_HAVE_LOADERPATH@)
+            SET (LIB_CHG_TO "${ATLOADER}/libintl.dylib")
+        ENDIF (@OSX_HAVE_LOADERPATH@)
+        MESSAGE(STATUS "INSTALLNAMETOOL_CHANGE (${INTLLIB} ${LIB_CHG_TO} ${QLIBDIR}/libpq.dylib")
+        INSTALLNAMETOOL_CHANGE (${INTLLIB} ${LIB_CHG_TO} "${QLIBDIR}/libpq.dylib")
+    ENDIF (INTLLIB)
 ENDIF ()
 
 # libfcgi (non-system)
@@ -108,4 +119,3 @@
     GET_INSTALL_NAME ("@FCGI_LIBRARY@" "libfcgi" FCGILIB)
     UPDATEQGISPATHS (${FCGILIB} libfcgi.dylib)
 ENDIF ()
-