Attachment 922765 Details for Bug 1125021 – Patch to fix the afected Qt5GuiConfigExtras.cmake based on the upstream resolution

[patch] Patch to fix the afected Qt5GuiConfigExtras.cmake based on the upstream resolution

only-use-libs-if-found.patch (text/plain), 2.20 KB, created by Chuck Atkins on 2014-07-30 22:26:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chuck Atkins

Created: 2014-07-30 22:26:48 UTC

Size: 2.20 KB

patch

obsolete

>--- /usr/lib64/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake	2014-07-30 17:30:01.956232844 -0400
>+++ /usr/lib64/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake.fixed	2014-07-30 18:25:41.469738785 -0400
>@@ -9,12 +9,14 @@
>         if (NOT TARGET Qt5::Gui_${_cmake_lib_name} AND NOT _Qt5Gui_${_cmake_lib_name}_LIBRARY_DONE)
>             find_library(Qt5Gui_${_cmake_lib_name}_LIBRARY ${_lib}
>             )
>-            if (WIN32 AND NOT Qt5Gui_${_cmake_lib_name}_LIBRARY)
>+            if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY)
>                 # The above find_library call doesn't work for finding
>                 # libraries in Windows SDK paths outside of the proper
>-                # environment.  Just add the library name to the result
>-                # variable instead.
>-                # We avoid doing this in the first case because Qt may be
>+                # environment, even if the libraries are present.  In other
>+                # cases it is OK for the libraries to not be found
>+                # because they are optional dependencies of Qt5Gui, needed
>+                # only if the qopengl.h header is used.
>+                # We try to find the libraries in the first place because Qt may be
>                 # compiled with another set of GL libraries (such as coming
>                 # from ANGLE).  The point of these find calls is to try to
>                 # find the same binaries as Qt is compiled with (as they are
>@@ -22,8 +24,7 @@
>                 # above with paths known to qmake.
>                 set(_Qt5Gui_${_cmake_lib_name}_LIBRARY_DONE TRUE)
>                 unset(Qt5Gui_${_cmake_lib_name}_LIBRARY CACHE)
>-                list(APPEND Qt5Gui_${Name}_LIBRARIES ${_lib})
>-            else ()
>+            elseif (Qt5Gui_${_cmake_lib_name}_LIBRARY)
>                 add_library(Qt5::Gui_${_cmake_lib_name} SHARED IMPORTED)
>                 set_property(TARGET Qt5::Gui_${_cmake_lib_name} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Qt5Gui_${Name}_INCLUDE_DIRS})
> 
>@@ -47,11 +48,6 @@
>             endif()
>         endif()
>     endforeach()
>-    if (NOT CMAKE_CROSSCOMPILING)
>-        foreach(_dir ${Qt5Gui_${Name}_INCLUDE_DIRS})
>-            _qt5_Gui_check_file_exists(${_dir})
>-        endforeach()
>-    endif()
> endmacro()
> 
>

Actions: View | Diff

Attachments on bug 1125021: 922742 | 922743 | 922765