From e6e968e4eae95fbbbb4ae2a78c003b04c022f829 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 10 Feb 2018 20:06:45 +0100 Subject: [PATCH] Fix locating Qt's translations under openSUSE --- CMakeLists.txt | 2 +- cmake/modules/QtConfig.cmake | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ba83527..0b82bd6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(META_APP_URL "https://github.com/${META_APP_AUTHOR}/${META_PROJECT_NAME}") set(META_APP_DESCRIPTION "Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models") set(META_VERSION_MAJOR 5) set(META_VERSION_MINOR 8) -set(META_VERSION_PATCH 2) +set(META_VERSION_PATCH 3) set(META_APP_VERSION ${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}) # add project files diff --git a/cmake/modules/QtConfig.cmake b/cmake/modules/QtConfig.cmake index aa3519a..e792eff 100644 --- a/cmake/modules/QtConfig.cmake +++ b/cmake/modules/QtConfig.cmake @@ -151,10 +151,17 @@ option(BUILTIN_TRANSLATIONS "enables/disables built-in translations when buildin set(QT_TRANSLATION_FILES) set(QT_TRANSLATION_SEARCH_PATHS) if(CMAKE_FIND_ROOT_PATH) - list(APPEND QT_TRANSLATION_SEARCH_PATHS "${CMAKE_FIND_ROOT_PATH}/share/qt/translations") + list(APPEND QT_TRANSLATION_SEARCH_PATHS + "${CMAKE_FIND_ROOT_PATH}/share/qt/translations" + "${CMAKE_FIND_ROOT_PATH}/share/qt5/translations" + ) endif() -list(APPEND QT_TRANSLATION_SEARCH_PATHS "${CMAKE_INSTALL_PREFIX}/share/qt/translations") -list(APPEND QT_TRANSLATION_SEARCH_PATHS "/usr/share/qt/translations") +list(APPEND QT_TRANSLATION_SEARCH_PATHS + "${CMAKE_INSTALL_PREFIX}/share/qt/translations" + "${CMAKE_INSTALL_PREFIX}/share/qt5/translations" + "/usr/share/qt/translations" + "/usr/share/qt5/translations" +) foreach(QT_TRANSLATION_PATH ${QT_TRANSLATION_SEARCH_PATHS}) if(IS_DIRECTORY "${QT_TRANSLATION_PATH}") foreach(QT_REPO ${QT_REPOS})