@@ -11,6 +11,11 @@ set(QT_FOUND_EXTRA_LIBS_PRE)
1111
1212set (ENABLE_GTK_THEME_PLUGIN OFF )
1313
14+ macro (force_qt_lib_path LIBNAME FORCEPATH)
15+ set (_Qt5Gui_RELEASE_${LIBNAME} _PATH "${FORCEPATH} " CACHE FILEPATH "" FORCE)
16+ set (_Qt5Widgets_RELEASE_${LIBNAME} _PATH "${FORCEPATH} " CACHE FILEPATH "" FORCE)
17+ endmacro ()
18+
1419# Manually turn on static Qt deployment
1520if (PGE_ENABLE_STATIC_QT)
1621 set (MOONDUST_STATIC_QT_ROOT "${CMAKE_PREFIX_PATH} " CACHE STRING "Path to the static Qt root" )
@@ -27,13 +32,13 @@ if(PGE_ENABLE_STATIC_QT)
2732 endif ()
2833 endif ()
2934
30- find_library (QT_HARFBUZZ qtharfbuzz )
35+ find_library (QT_HARFBUZZ libqtharfbuzz.a )
3136 if (QT_HARFBUZZ)
32- # message("==Qt-HarfBuzz detected! (${QT_HARFBUZZ})==")
37+ message ("==Qt-HarfBuzz detected! (${QT_HARFBUZZ} )==" )
3338 list (APPEND QT_FOUND_EXTRA_LIBS ${QT_HARFBUZZ} )
3439 set (PGE_QT_STATIC_DETECTED TRUE )
3540 else ()
36- find_library (QT_HARFBUZZ harfbuzz )
41+ find_library (QT_HARFBUZZ libharfbuzz.a )
3742 if (QT_HARFBUZZ)
3843 list (APPEND QT_FOUND_EXTRA_LIBS ${QT_HARFBUZZ} )
3944 endif ()
@@ -400,7 +405,20 @@ if(PGE_ENABLE_STATIC_QT)
400405
401406 if (NOT QT_FREETYPE)
402407 # find_library(QT_freetype freetype)
403- list (APPEND QT_FOUND_EXTRA_LIBS freetype$<$<CONFIG:Debug>:d>)
408+ if (USE_SYSTEM_LIBFREETYPE)
409+ find_library (QT_SysFreeType libfreetype$<$<CONFIG:Debug>:d>.a)
410+ list (APPEND QT_FOUND_EXTRA_LIBS "${QT_SysFreeType} " )
411+ force_qt_lib_path(freetype "${QT_SysFreeType} " )
412+ else ()
413+ list (APPEND QT_FOUND_EXTRA_LIBS "${libFreeType_Libs} " )
414+ force_qt_lib_path(freetype "${libFreeType_Libs} " )
415+ endif ()
416+ else ()
417+ force_qt_lib_path(freetype "${QT_FREETYPE} " )
418+ endif ()
419+
420+ if (QT_HARFBUZZ)
421+ force_qt_lib_path(harfbuzz "${QT_HARFBUZZ} " )
404422 endif ()
405423
406424 foreach (xxlib Qt5DBus dbus-1)
@@ -420,6 +438,12 @@ if(PGE_ENABLE_STATIC_QT)
420438 message ("!!! EGL NOT FOUND!!!" )
421439 endif ()
422440
441+ # find_library(QT_tiff libtiff.a)
442+ set (_Qt5Gui_RELEASE_tiff_PATH "${libtiff_A_Lib} " CACHE FILEPATH "" FORCE)
443+ list (APPEND QT_FOUND_EXTRA_LIBS PGE_libtiff)
444+
445+ set (_Qt5Gui_RELEASE_z_PATH "${libZLib_A_Lib} " CACHE FILEPATH "" FORCE)
446+
423447 find_library (QT_udev udev)
424448 list (APPEND QT_FOUND_EXTRA_LIBS ${QT_udev} )
425449
0 commit comments