[vidalia-svn] r2833: Shuffle some po2ts and ts2po dependencies around and do a be (in vidalia/trunk: cmake src/tools/po2ts src/tools/ts2po src/vidalia/i18n)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-07-03 22:45:48 -0400 (Thu, 03 Jul 2008)
New Revision: 2833

Modified:
   vidalia/trunk/cmake/VidaliaMacros.cmake
   vidalia/trunk/src/tools/po2ts/CMakeLists.txt
   vidalia/trunk/src/tools/ts2po/CMakeLists.txt
   vidalia/trunk/src/vidalia/i18n/CMakeLists.txt
Log:
Shuffle some po2ts and ts2po dependencies around and do a better job of
figuring out their executable locations so we can build with Xcode again.


Modified: vidalia/trunk/cmake/VidaliaMacros.cmake
===================================================================
--- vidalia/trunk/cmake/VidaliaMacros.cmake	2008-07-03 17:54:11 UTC (rev 2832)
+++ vidalia/trunk/cmake/VidaliaMacros.cmake	2008-07-04 02:45:48 UTC (rev 2833)
@@ -10,19 +10,7 @@
 ##  the terms described in the LICENSE file.
 ##
 
-## Tool used to convert Qt's .ts files to GNU gettext .po format
-set(VIDALIA_TS2PO_EXECUTABLE ${Vidalia_BINARY_DIR}/src/tools/ts2po/ts2po)
-if (WIN32)
-  set(VIDALIA_TS2PO_EXECUTABLE ${VIDALIA_TS2PO_EXECUTABLE}.exe)
-endif(WIN32)
 
-## Tool used to convert GNU gettext .po files to Qt's .ts format
-set(VIDALIA_PO2TS_EXECUTABLE ${Vidalia_BINARY_DIR}/src/tools/po2ts/po2ts)
-if (WIN32)
-  set(VIDALIA_PO2TS_EXECUTABLE ${VIDALIA_PO2TS_EXECUTABLE}.exe)
-endif(WIN32)
-    
-
 ## Search for lrelease
 find_program(QT_LRELEASE_EXECUTABLE NAMES lrelease-qt4 lrelease
   PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH

Modified: vidalia/trunk/src/tools/po2ts/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/tools/po2ts/CMakeLists.txt	2008-07-03 17:54:11 UTC (rev 2832)
+++ vidalia/trunk/src/tools/po2ts/CMakeLists.txt	2008-07-04 02:45:48 UTC (rev 2833)
@@ -21,3 +21,8 @@
 ## Link the executable with the appropriate Qt libraries
 target_link_libraries(po2ts ${QT_LIBRARIES})
 
+## Remember the location of po2ts so we can use it in custom commands
+get_target_property(PO2TS_EXECUTABLE po2ts LOCATION)
+set(VIDALIA_PO2TS_EXECUTABLE ${PO2TS_EXECUTABLE}
+    CACHE STRING "Location of Vidalia's po2ts converter." FORCE)
+

Modified: vidalia/trunk/src/tools/ts2po/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/tools/ts2po/CMakeLists.txt	2008-07-03 17:54:11 UTC (rev 2832)
+++ vidalia/trunk/src/tools/ts2po/CMakeLists.txt	2008-07-04 02:45:48 UTC (rev 2833)
@@ -42,3 +42,8 @@
 ## Link the executable with the appropriate Qt libraries
 target_link_libraries(ts2po ${QT_LIBRARIES})
 
+## Remember the location of ts2po so we can use it in custom commands
+get_target_property(TS2PO_EXECUTABLE ts2po LOCATION)
+set(VIDALIA_TS2PO_EXECUTABLE ${TS2PO_EXECUTABLE}
+    CACHE STRING "Location of Vidalia's ts2po converter." FORCE)
+

Modified: vidalia/trunk/src/vidalia/i18n/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/vidalia/i18n/CMakeLists.txt	2008-07-03 17:54:11 UTC (rev 2832)
+++ vidalia/trunk/src/vidalia/i18n/CMakeLists.txt	2008-07-04 02:45:48 UTC (rev 2833)
@@ -40,9 +40,11 @@
 vidalia_add_po(vidalia_QMS ${vidalia_PO})
 
 ## Create a target that converts all .po files to Qt .qm files
-add_custom_target(i18n ALL DEPENDS ${vidalia_QMS})
+add_custom_target(i18n DEPENDS ${vidalia_QMS})
+add_dependencies(i18n po2ts)
 
 ## Create a target that runs lupdate for all the source and UI files
 add_custom_target(i18n-update)
+add_dependencies(i18n-update po2ts ts2po)
 vidalia_update_po(i18n-update ${vidalia_PO})