r18288 by jghali - fix detection of lrelease executable in case of Qt4 build

scribus-commit scribus-commit at lists.scribus.net
Sun May 26 00:33:14 UTC 2013


Author: jghali
Date: Sun May 26 00:33:14 2013
New Revision: 18288

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18288
Log:
fix detection of lrelease executable in case of Qt4 build

Modified:
    trunk/Scribus/resources/translations/po/CMakeLists.txt

Modified: trunk/Scribus/resources/translations/po/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18288&path=/trunk/Scribus/resources/translations/po/CMakeLists.txt
==============================================================================
--- trunk/Scribus/resources/translations/po/CMakeLists.txt (original)
+++ trunk/Scribus/resources/translations/po/CMakeLists.txt Sun May 26 00:33:14 2013
@@ -1,6 +1,11 @@
 INCLUDE_DIRECTORIES(
 "${CMAKE_SOURCE_DIR}/scribus"
 )
+
+SET(LRELEASE_EXECUTABLE ${QT_LRELEASE_EXECUTABLE})
+IF (USE_QT5)
+  SET(LRELEASE_EXECUTABLE lrelease)
+ENDIF (USE_QT5)
 
 #Install our qm files, selected from *.qm in this directory
 FILE( GLOB SCRIBUS_TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.ts )
@@ -27,7 +32,7 @@
 		#MESSAGE(STATUS "You want to install ${LANGSTR}:${WANTED_LANG}")
 		SET(QM_FILENAME "scribus.${LANGSTR}.qm")
 		ADD_CUSTOM_TARGET("release_ts_${LANGSTR}" ALL
-		  COMMAND lrelease ${TS_FILEPATH} -silent -qm ${QM_FILENAME}
+		  COMMAND ${LRELEASE_EXECUTABLE} ${TS_FILEPATH} -silent -qm ${QM_FILENAME}
 		  DEPENDS ${TS_FILEPATH}
 		)
 		INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${QM_FILENAME}" DESTINATION ${SHAREDIR}/translations)
@@ -42,7 +47,7 @@
 	STRING(REPLACE "." ""  LANGSTR ${LANGSTR})
 	SET(QM_FILENAME "scribus.${LANGSTR}.qm")
 	ADD_CUSTOM_TARGET("release_ts_${LANGSTR}" ALL
-	  COMMAND lrelease ${TS_FILEPATH} -silent -qm ${QM_FILENAME}
+	  COMMAND ${LRELEASE_EXECUTABLE} ${TS_FILEPATH} -silent -qm ${QM_FILENAME}
 	  DEPENDS ${TS_FILEPATH}
 	)
 	INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${QM_FILENAME}" DESTINATION ${SHAREDIR}/translations)




More information about the scribus-commit mailing list