Project

General

Profile

configure-qt4-fix-on-windows.patch

rhabacker, 04/26/2019 10:45 AM

Download (2.12 KB)

View differences:

gwenhywfar-4.20.1/gui/qt4/gwengui-qt4-config.cmake.in 2018-10-08 18:08:40.577547675 +0200
44 44
set_and_check(exec_prefix "@exec_prefix@")
45 45
set_and_check(includedir "@includedir@")
46 46
set_and_check(${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIRS "@gwenhywfar_headerdir@")
47
set_and_check(${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES "@libdir@/libgwengui-qt4.so")
47
if(WIN32)
48
  set_and_check(${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES "@libdir@/libgwengui-qt4.dll.a")
49
else()
50
  set_and_check(${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES "@libdir@/libgwengui-qt4.so")
51
endif()
48 52
set(${CMAKE_FIND_PACKAGE_NAME}_FOUND true)
49 53

  
50 54
if(${CMAKE_FIND_PACKAGE_NAME}_FOUND AND NOT TARGET gwenhywfar::gui-qt4)
gwenhywfar-4.20.1/m4/qt4.m4 2018-10-08 18:14:09.442154965 +0200
112 112
# Shared library suffix. On linux this was set as
113 113
# shrext_cmds='.so'; but on darwin it is actually a text command.
114 114
eval std_shrext=\"$shrext_cmds\"
115
if test -n "${std_shrext}"; then
115
if test -z "${std_shrext}"; then
116 116
   std_shrext='.so'
117 117
fi
118 118

  
......
121 121
# This is the name of the qt library to search for.
122 122
if test "x$OSYSTEM" = "xosx"; then
123 123
   qt_searchname="lib${qt_libname}.4.dylib"
124
elif test "x$host" = "xi686-w64-mingw32" || test "x$host" = "xx86_64-w64-mingw32"; then
125
   qt_searchname="lib${qt_libname}4${std_shrext}.a"
124 126
else
125 127
   qt_searchname="lib${qt_libname}${std_shrext}.4"
126 128
fi
......
129 131
if test -z "$qt4_libs"; then
130 132
   AQ_SEARCH_FOR_PATH([$qt_searchname],[$local_qt4_libs])
131 133
   if test -n "$found_dir" ; then
134
     if test "x$host" = "xi686-w64-mingw32" || test "x$host" = "xx86_64-w64-mingw32"; then
135
       qt4_libs="-L$found_dir -l${qt_libname}4 -lQtCore4 -no-undefined"
136
     else
132 137
     qt4_libs="-L$found_dir -l${qt_libname} -lQtCore"
133 138
   fi
139
   fi
134 140
fi
135 141

  
136 142
if test -n "$qt4_libs"; then