diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2010-06-12 19:00:08 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2010-06-12 19:00:08 (GMT) |
| commit | 1f608718fccf33c659845b8215efc112d258695c (patch) | |
| tree | 422970a64907ef84a5ddcfdc219eee0f6170df2d /Modules/Qt4ConfigDependentSettings.cmake | |
| parent | a7abcd1442828792fc39397ced96a28cda95b032 (diff) | |
| download | CMake-1f608718fccf33c659845b8215efc112d258695c.zip CMake-1f608718fccf33c659845b8215efc112d258695c.tar.gz CMake-1f608718fccf33c659845b8215efc112d258695c.tar.bz2 | |
Remove macro for querying qmake for qmake variables.
Remove last place for querying qmake values.
Also removed internal macro to support querying qmake.
Depends on findthreads-irix topic.
Diffstat (limited to 'Modules/Qt4ConfigDependentSettings.cmake')
| -rw-r--r-- | Modules/Qt4ConfigDependentSettings.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/Qt4ConfigDependentSettings.cmake b/Modules/Qt4ConfigDependentSettings.cmake index ccbc828..1d77c7a 100644 --- a/Modules/Qt4ConfigDependentSettings.cmake +++ b/Modules/Qt4ConfigDependentSettings.cmake @@ -301,8 +301,11 @@ IF(Q_WS_X11) # X11 libraries Qt always depends on SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${X11_Xext_LIB} ${X11_X11_LIB}) - QT_QUERY_QMAKE(QT_LIBS_THREAD "QMAKE_LIBS_THREAD") - SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${QT_LIBS_THREAD}) + set(CMAKE_THREAD_PREFER_PTHREADS 1) + find_package(Threads) + if(CMAKE_USE_PTHREADS_INIT) + SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${CMAKE_THREAD_LIBS_INIT}) + endif(CMAKE_USE_PTHREADS_INIT) SET (QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${CMAKE_DL_LIBS}) |