diff options
author | Kevin Funk <kevin.funk@kdab.com> | 2016-06-22 13:28:39 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2016-06-22 20:27:00 +0000 |
commit | f05269473e4811279bf3ce20bd047755c41189cb (patch) | |
tree | 8977a716e9c0c5b4d335da3b99a480afbca13392 | |
parent | 6d167a096617d246ed11da34ed9c7b9ea5ab7099 (diff) |
Work-around for KDAB CI
Change-Id: I9c527b88665a82f126b739bffeeab14aa30ec879
Reviewed-by: Volker Krause <volker.krause@kdab.com>
Reviewed-by: Continuous Integration (KDAB) <build@kdab.com>
-rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 890847c..e30678b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,12 @@ set_package_properties(GammaRay PROPERTIES PURPOSE "Needed to build custom GammaRay plug-ins." ) +# TODO: Work-around for CI where Qt5Ivi is installed into separate prefix +# Qt5IviCore pulls in Qt5Qml, but find_package inside there only checks $PWD/../; it does not honor CMAKE_PREFIX_PATH +# Pull in Qt5Qml manually, to honor CMAKE_PREFIX_PATH +# I consider this a bug in the generated CMake config files -- we should not set NO_DEFAULT_PATH there +find_package(Qt5Qml REQUIRED) + find_package(Qt5IviCore REQUIRED) find_package(Qt5IviVehicleFunctions REQUIRED) |