[vidalia-svn] r4283: Force CMake to include the *_RELEASE versions of Qt librarie (vidalia/trunk/pkg/osx)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2010-05-11 23:27:27 -0400 (Tue, 11 May 2010)
New Revision: 4283

Modified:
   vidalia/trunk/pkg/osx/CMakeLists.txt
Log:

Force CMake to include the *_RELEASE versions of Qt libraries when
building a .dmg on Mac OS X, so that it will work with CMake >= 2.8 as
well. (CMake apparently changed the semantics of QT_{foo}_LIBRARY from
their 2.6 to 2.8 releases.)


Modified: vidalia/trunk/pkg/osx/CMakeLists.txt
===================================================================
--- vidalia/trunk/pkg/osx/CMakeLists.txt	2010-05-04 18:48:59 UTC (rev 4282)
+++ vidalia/trunk/pkg/osx/CMakeLists.txt	2010-05-12 03:27:27 UTC (rev 4283)
@@ -17,24 +17,24 @@
 if (QT_USE_FRAMEWORKS)
   vidalia_install_qt4_framework(QtCore
     TARGET dist-osx-libraries NAME QtCore
-    LIBRARY ${QT_QTCORE_LIBRARY}/QtCore
+    LIBRARY ${QT_QTCORE_LIBRARY_RELEASE}/QtCore
     APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
   )
   vidalia_install_qt4_framework(QtGui
     TARGET dist-osx-libraries NAME QtGui
-    LIBRARY ${QT_QTGUI_LIBRARY}/QtGui
+    LIBRARY ${QT_QTGUI_LIBRARY_RELEASE}/QtGui
     APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
     DEPENDS_FRAMEWORKS ${QtCore}
   )
   vidalia_install_qt4_framework(QtNetwork
     TARGET dist-osx-libraries NAME QtNetwork
-    LIBRARY ${QT_QTNETWORK_LIBRARY}/QtNetwork
+    LIBRARY ${QT_QTNETWORK_LIBRARY_RELEASE}/QtNetwork
     APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
     DEPENDS_FRAMEWORKS ${QtCore}
   )
   vidalia_install_qt4_framework(QtXml
     TARGET dist-osx-libraries NAME QtXml
-    LIBRARY ${QT_QTXML_LIBRARY}/QtXml
+    LIBRARY ${QT_QTXML_LIBRARY_RELEASE}/QtXml
     APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
     DEPENDS_FRAMEWORKS ${QtCore}
   )
@@ -45,31 +45,31 @@
   if (USE_MARBLE)
     vidalia_install_qt4_framework(QtSvg
       TARGET dist-osx-libraries NAME QtSvg
-      LIBRARY ${QT_QTSVG_LIBRARY}/QtSvg
+      LIBRARY ${QT_QTSVG_LIBRARY_RELEASE}/QtSvg
       APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
       DEPENDS_FRAMEWORKS ${QtCore} ${QtGui}
     )
     vidalia_install_qt4_framework(QtScript
       TARGET dist-osx-libraries NAME QtScript
-      LIBRARY ${QT_QTSCRIPT_LIBRARY}/QtScript
+      LIBRARY ${QT_QTSCRIPT_LIBRARY_RELEASE}/QtScript
       APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
       DEPENDS_FRAMEWORKS ${QtCore}
     )
     vidalia_install_qt4_framework(QtDBus
       TARGET dist-osx-libraries NAME QtDBus
-      LIBRARY ${QT_QTDBUS_LIBRARY}/QtDBus
+      LIBRARY ${QT_QTDBUS_LIBRARY_RELEASE}/QtDBus
       APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
       DEPENDS_FRAMEWORKS ${QtCore} ${QtXml}
     )
     vidalia_install_qt4_framework(QtPhonon
       TARGET dist-osx-libraries NAME phonon
-      LIBRARY ${QT_PHONON_LIBRARY}/phonon
+      LIBRARY ${QT_PHONON_LIBRARY_RELEASE}/phonon
       APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
       DEPENDS_FRAMEWORKS ${QtCore} ${QtGui} ${QtXml} ${QtDBus}
     )
     vidalia_install_qt4_framework(QtWebKit
       TARGET dist-osx-libraries NAME QtWebKit
-      LIBRARY ${QT_QTWEBKIT_LIBRARY}/QtWebKit
+      LIBRARY ${QT_QTWEBKIT_LIBRARY_RELEASE}/QtWebKit
       APP_BUNDLE ${VIDALIA_APP_BUNDLE_ROOT}
       DEPENDS_FRAMEWORKS ${QtCore} ${QtGui} ${QtNetwork} ${QtXml} ${QtDBus}
                          ${QtPhonon}