Changeset 2833 for vidalia/trunk/src

Show
Ignore:
Timestamp:
07/03/08 22:45:48 (5 months ago)
Author:
edmanm
Message:

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.

Location:
vidalia/trunk/src
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • vidalia/trunk/src/tools/po2ts/CMakeLists.txt

    r2747 r2833  
    2222target_link_libraries(po2ts ${QT_LIBRARIES}) 
    2323 
     24## Remember the location of po2ts so we can use it in custom commands 
     25get_target_property(PO2TS_EXECUTABLE po2ts LOCATION) 
     26set(VIDALIA_PO2TS_EXECUTABLE ${PO2TS_EXECUTABLE} 
     27    CACHE STRING "Location of Vidalia's po2ts converter." FORCE) 
     28 
  • vidalia/trunk/src/tools/ts2po/CMakeLists.txt

    r2817 r2833  
    4343target_link_libraries(ts2po ${QT_LIBRARIES}) 
    4444 
     45## Remember the location of ts2po so we can use it in custom commands 
     46get_target_property(TS2PO_EXECUTABLE ts2po LOCATION) 
     47set(VIDALIA_TS2PO_EXECUTABLE ${TS2PO_EXECUTABLE} 
     48    CACHE STRING "Location of Vidalia's ts2po converter." FORCE) 
     49 
  • vidalia/trunk/src/vidalia/i18n/CMakeLists.txt

    r2804 r2833  
    4141 
    4242## Create a target that converts all .po files to Qt .qm files 
    43 add_custom_target(i18n ALL DEPENDS ${vidalia_QMS}) 
     43add_custom_target(i18n DEPENDS ${vidalia_QMS}) 
     44add_dependencies(i18n po2ts) 
    4445 
    4546## Create a target that runs lupdate for all the source and UI files 
    4647add_custom_target(i18n-update) 
     48add_dependencies(i18n-update po2ts ts2po) 
    4749vidalia_update_po(i18n-update ${vidalia_PO}) 
    4850