diff options
| author | Brad King <brad.king@kitware.com> | 2013-04-03 15:42:50 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-04-03 15:42:50 (GMT) |
| commit | 00ef90ec5eaa0c005a167eba64d6956293747ac6 (patch) | |
| tree | 15b009595b8b1877afb160e60f1c464f7f49e7a5 | |
| parent | 99f7cc127a772f8c930d6045068db2645a84bba2 (diff) | |
| parent | bec8e64c735f8953bfe4b26a886add17f11fe440 (diff) | |
| download | CMake-00ef90ec5eaa0c005a167eba64d6956293747ac6.zip CMake-00ef90ec5eaa0c005a167eba64d6956293747ac6.tar.gz CMake-00ef90ec5eaa0c005a167eba64d6956293747ac6.tar.bz2 | |
Merge topic 'qt4-pthread'
bec8e64 Qt4: Fix typo setting a variable for FindThreads.
| -rw-r--r-- | Modules/Qt4ConfigDependentSettings.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Qt4ConfigDependentSettings.cmake b/Modules/Qt4ConfigDependentSettings.cmake index 6db5da1..88dc8ec 100644 --- a/Modules/Qt4ConfigDependentSettings.cmake +++ b/Modules/Qt4ConfigDependentSettings.cmake @@ -260,7 +260,7 @@ 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}) - set(CMAKE_THREAD_PREFER_PTHREADS 1) + set(CMAKE_THREAD_PREFER_PTHREAD 1) find_package(Threads) if(CMAKE_USE_PTHREADS_INIT) set(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${CMAKE_THREAD_LIBS_INIT}) |