[Pkg-owncloud-commits] [qtkeychain] 96/115: Merge pull request #27 from xhochy/qt5-fix-translations

[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 0056a2893f48a9473934c334da0bfb43db5f04e7
Merge: 32df06c 59084e3
Author: Frank Osterfeld <frank.osterfeld at kdab.com>
Date:   Thu Nov 21 00:30:02 2013 -0800

    Merge pull request #27 from xhochy/qt5-fix-translations
    
    Query qmake5 for QT_TRANSLATION_DIR

 CMakeLists.txt | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --cc CMakeLists.txt
index f4ec3eb,046369b..ad8d21c
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -119,10 -120,23 +119,24 @@@ qt_add_translation(qtkeychain_QM_FILES 
  add_custom_target(messages DEPENDS ${qtkeychain_MESSAGES})
  add_custom_target(translations DEPENDS ${qtkeychain_QM_FILES})
  
- #install(FILES ${qtkeychain_QM_FILES}
- #        DESTINATION ${QT_TRANSLATIONS_DIR})
+ if(NOT QT_TRANSLATIONS_DIR)
+     # If this directory is missing, we are in a Qt5 environment.
+     # 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 )
+     # 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
+     location of the Qt translations" FORCE)
+ endif()
+ 
+ install(FILES ${qtkeychain_QM_FILES}
+         DESTINATION ${QT_TRANSLATIONS_DIR})
  
 +set(QTKEYCHAIN_TARGET_NAME qt${QTKEYCHAIN_VERSION_INFIX}keychain)
  if(NOT QTKEYCHAIN_STATIC)
      add_library(${QTKEYCHAIN_TARGET_NAME} SHARED ${qtkeychain_SOURCES} ${qtkeychain_MOC_OUTFILES} ${qtkeychain_QM_FILES})
      set_target_properties(${QTKEYCHAIN_TARGET_NAME} PROPERTIES COMPILE_DEFINITIONS QKEYCHAIN_BUILD_QKEYCHAIN_LIB)

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