[vidalia-svn] r2200: Make some variable names look a bit more consistent in ccmak (trunk)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-12-07 18:07:43 -0500 (Fri, 07 Dec 2007)
New Revision: 2200

Modified:
   trunk/
   trunk/VidaliaMacros.cmake
Log:
 r2273@lysithea:  edmanm | 2007-12-07 18:07:23 -0500
 Make some variable names look a bit more consistent in ccmake.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2273] on 0108964c-5b0b-4c9e-969f-e2288315d100

Modified: trunk/VidaliaMacros.cmake
===================================================================
--- trunk/VidaliaMacros.cmake	2007-12-07 23:07:31 UTC (rev 2199)
+++ trunk/VidaliaMacros.cmake	2007-12-07 23:07:43 UTC (rev 2200)
@@ -23,24 +23,24 @@
 
 
 ## Search for lrelease
-find_program(lrelease_CMD NAMES lrelease-qt4 lrelease
+find_program(QT_LRELEASE_EXECUTABLE NAMES lrelease-qt4 lrelease
   PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH
 )
-if (NOT lrelease_CMD)
+if (NOT QT_LRELEASE_EXECUTABLE)
   message(FATAL_ERROR
     "Vidalia could not find lrelease. Please make sure Qt >= 4.1 is installed."
   )
-endif(NOT lrelease_CMD)
+endif(NOT QT_LRELEASE_EXECUTABLE)
 
 
 ## We need windres.exe when building on MinGW to compile the .rc file
 if (MINGW)
-  find_program(windres_CMD  NAMES windres.exe ${QT_BINARY_DIR})
-  if (NOT windres_CMD)
+  find_program(MINGW_WINDRES_EXECUTABLE  NAMES windres.exe ${QT_BINARY_DIR})
+  if (NOT MINGW_WINDRES_EXECUTABLE)
     message(FATAL_ERR
       "Vidalia could not find windres. Please make sure MinGW is installed."
     )
-  endif(NOT windres_CMD)
+  endif(NOT MINGW_WINDRES_EXECUTABLE)
 endif(MINGW)
 
 
@@ -52,7 +52,7 @@
 
     set(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfile}.qm)
     add_custom_command(OUTPUT ${outfile}
-      COMMAND ${lrelease_CMD}
+      COMMAND ${QT_LRELEASE_EXECUTABLE}
       ARGS -compress -silent -nounfinished ${it} -qm ${outfile}
       MAIN_DEPENDENCY ${it}
     )
@@ -71,7 +71,7 @@
       
       set(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfile}_res.o)
       add_custom_command(OUTPUT ${outfile}
-        COMMAND ${windres_CMD}
+        COMMAND ${MINGW_WINDRES_EXECUTABLE}
         ARGS -i ${it} -o ${outfile} --include-dir=${rc_path}
         MAIN_DEPENDENCY ${it}
       )