diff options
| author | Klaas Freitag <freitag@owncloud.com> | 2015-11-18 16:43:41 +0300 |
|---|---|---|
| committer | Klaas Freitag <freitag@owncloud.com> | 2015-11-18 16:43:41 +0300 |
| commit | 300c1c2055aece397b074ad6ecf94b66b3202ca2 (patch) | |
| tree | 837bbe298613725e9542f1b373fa0b8b9b1fe2e5 /cmake | |
| parent | fb42183bc76809edbfe70cfb2ec2ea1cce0bd27c (diff) | |
| parent | 6123fab0910fc3f787ea7fb9df8a0d48f8345f5f (diff) | |
Merge remote-tracking branch 'origin/depclean' into 2.1
Conflicts:
cmake/modules/QtVersionAbstraction.cmake
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/QtVersionAbstraction.cmake | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/cmake/modules/QtVersionAbstraction.cmake b/cmake/modules/QtVersionAbstraction.cmake index 6f222e097..12fe7be1b 100644 --- a/cmake/modules/QtVersionAbstraction.cmake +++ b/cmake/modules/QtVersionAbstraction.cmake @@ -21,10 +21,6 @@ if( Qt5Core_FOUND ) if(NOT TOKEN_AUTH_ONLY) find_package(Qt5WebKitWidgets REQUIRED) find_package(Qt5WebKit REQUIRED) - find_package(Qt5PrintSupport REQUIRED) - if(NOT APPLE) - find_package(Qt5Quick REQUIRED) # only needed on Windows because of OBS dependencies(?) - endif() find_package(Qt5Widgets REQUIRED) if(APPLE) find_package(Qt5MacExtras REQUIRED) @@ -76,11 +72,16 @@ endif() endmacro() if(NOT TOKEN_AUTH_ONLY) - find_package(Qt5LinguistTools REQUIRED) - macro(qt_add_translation) - qt5_add_translation(${ARGN}) - endmacro() - else() + find_package(Qt5LinguistTools) + if(Qt5LinguistTools_FOUND) + macro(qt_add_translation) + qt5_add_translation(${ARGN}) + endmacro() + else() + macro(qt_add_translation) + endmacro() + endif() +else() macro(qt_add_translation) endmacro() endif() |