diff options
author | Klaas Freitag <freitag@owncloud.com> | 2015-11-11 17:24:02 +0300 |
---|---|---|
committer | Klaas Freitag <freitag@owncloud.com> | 2015-11-11 17:24:02 +0300 |
commit | 6123fab0910fc3f787ea7fb9df8a0d48f8345f5f (patch) | |
tree | f9f20cc7affa1fade33b4ea149da71fe2a1ceba7 /cmake | |
parent | 46269dac4eb9ce78a7bfc77edb8a9126ccb469cc (diff) |
CMake version abstractions: Remove some dependencies.
That lets us get rid of the hard dependency on Qt tools which are
not easily available everywhere.
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/modules/QtVersionAbstraction.cmake | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/cmake/modules/QtVersionAbstraction.cmake b/cmake/modules/QtVersionAbstraction.cmake index d7cbde33a..1b744a663 100644 --- a/cmake/modules/QtVersionAbstraction.cmake +++ b/cmake/modules/QtVersionAbstraction.cmake @@ -21,8 +21,8 @@ if( Qt5Core_FOUND ) if(NOT TOKEN_AUTH_ONLY) find_package(Qt5WebKitWidgets REQUIRED) find_package(Qt5WebKit REQUIRED) - find_package(Qt5PrintSupport REQUIRED) - find_package(Qt5Quick REQUIRED) + find_package(Qt5PrintSupport) + find_package(Qt5Quick) find_package(Qt5Widgets REQUIRED) if(APPLE) find_package(Qt5MacExtras REQUIRED) @@ -74,11 +74,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() |