aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanner Lovelace <clubjuggler@gmail.com>2006-03-29 16:50:10 +0000
committerTanner Lovelace <clubjuggler@gmail.com>2006-03-29 16:50:10 +0000
commit749954b40e3c24ce379cf9511bb8162c2ac92239 (patch)
tree2241440ad716d352cf22185affa1d7e81341c531
parent4947881ecfe66c7662c16e9294139cdf2fe28cde (diff)
downloadextra-cmake-modules-749954b40e3c24ce379cf9511bb8162c2ac92239.tar.gz
extra-cmake-modules-749954b40e3c24ce379cf9511bb8162c2ac92239.tar.bz2
Consolidate checks for the Microsoft Windows windowing system into one line instead of specifically checking for win32 or win64. (Thanks to Thiago for the info about this.)
svn path=/trunk/KDE/kdelibs/; revision=524072
-rw-r--r--modules/FindQt4.cmake3
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake
index 19a54072..0b53efce 100644
--- a/modules/FindQt4.cmake
+++ b/modules/FindQt4.cmake
@@ -724,8 +724,7 @@ IF (QT4_QMAKE_FOUND)
# Check for Window system symbols (note: only one should end up being set)
CHECK_SYMBOL_EXISTS(Q_WS_X11 "QtCore/qglobal.h" Q_WS_X11)
CHECK_SYMBOL_EXISTS(Q_WS_MAC "QtCore/qglobal.h" Q_WS_MAC)
- CHECK_SYMBOL_EXISTS(Q_WS_WIN32 "QtCore/qglobal.h" Q_WS_WIN32)
- CHECK_SYMBOL_EXISTS(Q_WS_WIN64 "QtCore/qglobal.h" Q_WS_WIN64)
+ CHECK_SYMBOL_EXISTS(Q_WS_WIN "QtCore/qglobal.h" Q_WS_WIN)
# Restore CMAKE_REQUIRED_INCLUDES variable
SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE})