[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r2224: Write the lrelease output to CMAKE_CURRENT_SOURCE_DIR, inste (trunk)



Author: edmanm
Date: 2007-12-16 20:37:57 -0500 (Sun, 16 Dec 2007)
New Revision: 2224

Modified:
   trunk/
   trunk/VidaliaMacros.cmake
Log:
 r2319@lysithea:  edmanm | 2007-12-16 20:35:45 -0500
 Write the lrelease output to CMAKE_CURRENT_SOURCE_DIR, instead of
 CMAKE_CURRENT_BINARY_DIR, so RCC can find them when doing out-of-source
 builds. This is mildly regrettable, but seems unavoidable at the moment.



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

Modified: trunk/VidaliaMacros.cmake
===================================================================
--- trunk/VidaliaMacros.cmake	2007-12-17 00:32:04 UTC (rev 2223)
+++ trunk/VidaliaMacros.cmake	2007-12-17 01:37:57 UTC (rev 2224)
@@ -61,7 +61,10 @@
     get_filename_component(it ${it} ABSOLUTE)
     get_filename_component(outfile ${it} NAME_WE)
 
-    set(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfile}.qm)
+    ## XXX: Ideally we would output the .qm files to CMAKE_CURRENT_BINARY_DIR,
+    ##      but then RCC can't find them when doing out-of-source builds. Is
+    ##      there an easy fix for this?
+    set(outfile ${CMAKE_CURRENT_SOURCE_DIR}/${outfile}.qm)
     add_custom_command(OUTPUT ${outfile}
       COMMAND ${QT_LRELEASE_EXECUTABLE}
       ARGS -compress -silent -nounfinished ${it} -qm ${outfile}