[Pkg-owncloud-commits] [qtkeychain] 01/35: fix translation install dir on qt5 if qmake reported Qt: Untested Windows version 10.0 detected! in the error stream

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository qtkeychain.

commit e4dc97a9b44207a82e0ec31895f556bf0cf70a80
Author: Patrick von Reth <vonreth at kde.org>
Date:   Wed Mar 4 15:48:16 2015 +0100

    fix translation install dir on qt5 if qmake reported Qt: Untested Windows version 10.0 detected! in the error stream
---
 CMakeLists.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8f88f6..546f083 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,9 +127,8 @@ if(NOT QT_TRANSLATIONS_DIR)
     # Extract the qmake executable location
     get_target_property(QT5_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
     # Ask Qt5 where to put the translations
-    EXEC_PROGRAM( ${QT5_QMAKE_EXECUTABLE}
-        ARGS -query QT_INSTALL_TRANSLATIONS
-        OUTPUT_VARIABLE qt_translations_dir )
+    execute_process( COMMAND ${QT5_QMAKE_EXECUTABLE} -query QT_INSTALL_TRANSLATIONS
+        OUTPUT_VARIABLE qt_translations_dir OUTPUT_STRIP_TRAILING_WHITESPACE )
     # make sure we have / and not \ as qmake gives on windows
     FILE(TO_CMAKE_PATH "${qt_translations_dir}" qt_translations_dir)
     SET(QT_TRANSLATIONS_DIR ${qt_translations_dir} CACHE PATH "The

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/qtkeychain.git