[vidalia-svn] r3747: Backport r3745 and give it a changelog entry. (in vidalia/branches/vidalia-0.1: . cmake)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-04-30 15:07:57 -0400 (Thu, 30 Apr 2009)
New Revision: 3747

Modified:
   vidalia/branches/vidalia-0.1/
   vidalia/branches/vidalia-0.1/CHANGELOG
   vidalia/branches/vidalia-0.1/cmake/VidaliaMacros.cmake
Log:

Backport r3745 and give it a changelog entry.



Property changes on: vidalia/branches/vidalia-0.1
___________________________________________________________________
Modified: svn:mergeinfo
   - /vidalia/trunk:3235,3482,3504-3505,3516-3517,3519-3520,3522,3524-3526,3528,3530,3732,3740
   + /vidalia/trunk:3235,3482,3504-3505,3516-3517,3519-3520,3522,3524-3526,3528,3530,3732,3740,3745
/vidalia/trunk/cmake:3745

Modified: vidalia/branches/vidalia-0.1/CHANGELOG
===================================================================
--- vidalia/branches/vidalia-0.1/CHANGELOG	2009-04-30 04:51:01 UTC (rev 3746)
+++ vidalia/branches/vidalia-0.1/CHANGELOG	2009-04-30 19:07:57 UTC (rev 3747)
@@ -6,6 +6,10 @@
     run on system startup. Patch by Steve Tyree. (Ticket #247)
   o Fix a bug that prevented the control panel from displaying when
     running on the Enlightenment window manager. Patch by Steve Tyree.
+  o Rename the CMake variables used to store the location of Qt's lupdate
+    and lrelease executables. Recent versions of CMake decided to use the
+    same variable name, which was stomping on mine, resulting in the wrong
+    lupdate and lrelease executables being used.
 
 
 0.1.12  16-Mar-2009

Modified: vidalia/branches/vidalia-0.1/cmake/VidaliaMacros.cmake
===================================================================
--- vidalia/branches/vidalia-0.1/cmake/VidaliaMacros.cmake	2009-04-30 04:51:01 UTC (rev 3746)
+++ vidalia/branches/vidalia-0.1/cmake/VidaliaMacros.cmake	2009-04-30 19:07:57 UTC (rev 3747)
@@ -12,25 +12,25 @@
 
 
 ## Search for lrelease
-find_program(QT_LRELEASE_EXECUTABLE NAMES lrelease-qt4 lrelease
+find_program(VIDALIA_LRELEASE_EXECUTABLE NAMES lrelease-qt4 lrelease
   PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH
 )
-if (NOT QT_LRELEASE_EXECUTABLE)
+if (NOT VIDALIA_LRELEASE_EXECUTABLE)
   message(FATAL_ERROR
     "Vidalia could not find lrelease. Please make sure Qt >= ${QT_MIN_VERSION} is installed."
   )
-endif(NOT QT_LRELEASE_EXECUTABLE)
+endif(NOT VIDALIA_LRELEASE_EXECUTABLE)
 
 
 ## Search for lupdate
-find_program(QT_LUPDATE_EXECUTABLE NAMES lupdate-qt4 lupdate
+find_program(VIDALIA_LUPDATE_EXECUTABLE NAMES lupdate-qt4 lupdate
   PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH
 )
-if (NOT QT_LUPDATE_EXECUTABLE)
+if (NOT VIDALIA_LUPDATE_EXECUTABLE)
   message(FATAL_ERROR
     "Vidalia could not find lupdate. Please make sure Qt >= ${QT_MIN_VERSION} is installed."
   )
-endif(NOT QT_LUPDATE_EXECUTABLE)
+endif(NOT VIDALIA_LUPDATE_EXECUTABLE)
 
 
 ## We need windres.exe when building on Win32 to compile the .rc file
@@ -63,7 +63,7 @@
       COMMAND ${VIDALIA_PO2TS_EXECUTABLE}
       ARGS -q -i ${po} -o ${ts}
       # Update the .ts files
-      COMMAND ${QT_LUPDATE_EXECUTABLE}
+      COMMAND ${VIDALIA_LUPDATE_EXECUTABLE}
       ARGS -silent -noobsolete ${translate_SRCS} -ts ${ts}
       # Convert the updated .ts files back to .po
       COMMAND ${VIDALIA_TS2PO_EXECUTABLE}
@@ -90,7 +90,7 @@
     add_custom_command(OUTPUT ${qm}
       COMMAND ${VIDALIA_PO2TS_EXECUTABLE}
       ARGS -q -i ${po} -o ${ts}
-      COMMAND ${QT_LRELEASE_EXECUTABLE}
+      COMMAND ${VIDALIA_LRELEASE_EXECUTABLE}
       ARGS -compress -silent -nounfinished ${ts} -qm ${qm}
       MAIN_DEPENDENCY ${po}
       DEPENDS ${VIDALIA_PO2TS_EXECUTABLE}