diff options
| author | Aleix Pol <aleixpol@kde.org> | 2018-01-23 20:35:44 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2018-01-23 20:35:44 +0000 |
| commit | 9740ed6ca478fcac8884f974dba7bc0f4e1d1898 (patch) | |
| tree | 1be5e66e1a0d9ed0dfb3864498234eccd8ab3d25 | |
| parent | fac0b07d22bcd0ad4ae82651ac430ede500b2d1a (diff) | |
Fix QtGStreamer lookup on Qt5
No need to look-up the file, it will be in the current
directory. If there's a different version it will have
the same set of files. Also it includes the targets file,
so that we can link against the exported targets as "Qt5GStreamer".
https://bugzilla.gnome.org/show_bug.cgi?id=747247
| -rw-r--r-- | cmake/modules/QtGStreamerConfig.cmake.in | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cmake/modules/QtGStreamerConfig.cmake.in b/cmake/modules/QtGStreamerConfig.cmake.in index 4b1f609..54c5456 100644 --- a/cmake/modules/QtGStreamerConfig.cmake.in +++ b/cmake/modules/QtGStreamerConfig.cmake.in @@ -67,11 +67,8 @@ endif() unset(_QTGSTREAMER_FIND_DEPS_ARGS) -# include QtGStreamerConfigCommon.cmake from the same directory -find_file(_QTGSTREAMER_CONFIG_COMMON_FILE QtGStreamerConfigCommon.cmake - PATHS ${_QTGSTREAMER_CONFIG_DIR} NO_DEFAULT_PATH) -include(${_QTGSTREAMER_CONFIG_COMMON_FILE}) -unset(_QTGSTREAMER_CONFIG_COMMON_FILE) +include("${CMAKE_CURRENT_LIST_DIR}/QtGStreamerConfigCommon.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/@QTGSTREAMER_PACKAGE_NAME@Targets.cmake") # compatibility variable set(QTGSTREAMER_FOUND ${@QTGSTREAMER_PACKAGE_NAME@_FOUND}) |