1*4882a593SmuzhiyunFrom 0574975fb4a981568e69461c4df99767cc1faa72 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Max Krummenacher <max.krummenacher@toradex.com> 3*4882a593SmuzhiyunDate: Sat, 27 Oct 2018 12:29:31 +0000 4*4882a593SmuzhiyunSubject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to 5*4882a593Smuzhiyun sysroot 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunEGL is configured to need an include path into the recipe-specific sysroot. 8*4882a593SmuzhiyunHowever users of the cmake file will have a different absolute path than that 9*4882a593Smuzhiyunused when creating the cmake file from cmake.in in qtbase. 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunChange to store the relative path within the sysroot and then prepend the 12*4882a593Smuzhiyuncurrently used sysroot in the _qt5gui_find_extra_libs macro. 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunUpstream-Status: Inappropriate [OE specific] 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunSigned-off-by: Max Krummenacher <max.krummenacher@toradex.com> 17*4882a593Smuzhiyun--- 18*4882a593Smuzhiyun src/gui/Qt5GuiConfigExtras.cmake.in | 22 ++++++++-------------- 19*4882a593Smuzhiyun 1 file changed, 8 insertions(+), 14 deletions(-) 20*4882a593Smuzhiyun 21*4882a593Smuzhiyundiff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in 22*4882a593Smuzhiyunindex 84dbbfebd4..ad6956d814 100644 23*4882a593Smuzhiyun--- a/src/gui/Qt5GuiConfigExtras.cmake.in 24*4882a593Smuzhiyun+++ b/src/gui/Qt5GuiConfigExtras.cmake.in 25*4882a593Smuzhiyun@@ -75,21 +75,15 @@ unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE) 26*4882a593Smuzhiyun 27*4882a593Smuzhiyun macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) 28*4882a593Smuzhiyun set(Qt5Gui_${Name}_LIBRARIES) 29*4882a593Smuzhiyun-!!IF !mac 30*4882a593Smuzhiyun- set(Qt5Gui_${Name}_INCLUDE_DIRS ${IncDirs}) 31*4882a593Smuzhiyun-!!ELSE 32*4882a593Smuzhiyun+ 33*4882a593Smuzhiyun foreach(_dir ${IncDirs}) 34*4882a593Smuzhiyun- if (EXISTS ${_dir}) 35*4882a593Smuzhiyun- list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_dir}) 36*4882a593Smuzhiyun- else() 37*4882a593Smuzhiyun- find_path(_actual_dir ${_dir}) # Look in sdk directories 38*4882a593Smuzhiyun- if (_actual_dir) 39*4882a593Smuzhiyun- list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_actual_dir}) 40*4882a593Smuzhiyun- endif() 41*4882a593Smuzhiyun- unset(_actual_dir CACHE) 42*4882a593Smuzhiyun+ find_path(_actual_dir ${_dir}) 43*4882a593Smuzhiyun+ if (_actual_dir) 44*4882a593Smuzhiyun+ list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_actual_dir}) 45*4882a593Smuzhiyun endif() 46*4882a593Smuzhiyun+ unset(_actual_dir CACHE) 47*4882a593Smuzhiyun endforeach() 48*4882a593Smuzhiyun-!!ENDIF 49*4882a593Smuzhiyun+ 50*4882a593Smuzhiyun foreach(_lib ${Libs}) 51*4882a593Smuzhiyun if (IS_ABSOLUTE ${_lib}) 52*4882a593Smuzhiyun get_filename_component(_libFile ${_lib} NAME_WE) 53*4882a593Smuzhiyun@@ -171,11 +165,11 @@ endmacro() 54*4882a593Smuzhiyun 55*4882a593Smuzhiyun 56*4882a593Smuzhiyun !!IF !isEmpty(CMAKE_EGL_LIBS) 57*4882a593Smuzhiyun-_qt5gui_find_extra_libs(EGL \"$$CMAKE_EGL_LIBS\" \"$$CMAKE_EGL_LIBDIR\" \"$$CMAKE_EGL_INCDIRS\") 58*4882a593Smuzhiyun+_qt5gui_find_extra_libs(EGL \"$$CMAKE_EGL_LIBS\" \"$$CMAKE_EGL_LIBDIR\" \"$$replace(CMAKE_EGL_INCDIRS,$$re_escape($$PKG_CONFIG_SYSROOT_DIR),)\") 59*4882a593Smuzhiyun !!ENDIF 60*4882a593Smuzhiyun 61*4882a593Smuzhiyun !!IF !isEmpty(CMAKE_OPENGL_LIBS) 62*4882a593Smuzhiyun-_qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\" \"$$CMAKE_OPENGL_INCDIRS\") 63*4882a593Smuzhiyun+_qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\" \"$$replace(CMAKE_OPENGL_INCDIRS,$$re_escape($$PKG_CONFIG_SYSROOT_DIR),)\") 64*4882a593Smuzhiyun 65*4882a593Smuzhiyun !!ENDIF 66*4882a593Smuzhiyun 67