Merge topic 'qt4-pthread'
bec8e64
Qt4: Fix typo setting a variable for FindThreads.
This commit is contained in:
commit
00ef90ec5e
|
@ -260,7 +260,7 @@ if(Q_WS_X11)
|
||||||
# X11 libraries Qt always depends on
|
# X11 libraries Qt always depends on
|
||||||
set(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${X11_Xext_LIB} ${X11_X11_LIB})
|
set(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${X11_Xext_LIB} ${X11_X11_LIB})
|
||||||
|
|
||||||
set(CMAKE_THREAD_PREFER_PTHREADS 1)
|
set(CMAKE_THREAD_PREFER_PTHREAD 1)
|
||||||
find_package(Threads)
|
find_package(Threads)
|
||||||
if(CMAKE_USE_PTHREADS_INIT)
|
if(CMAKE_USE_PTHREADS_INIT)
|
||||||
set(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${CMAKE_THREAD_LIBS_INIT})
|
set(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${CMAKE_THREAD_LIBS_INIT})
|
||||||
|
|
Loading…
Reference in New Issue