summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2006-08-01 19:48:44 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2006-08-01 19:48:44 (GMT)
commit89fb18f54894446270df5de761b8a91854817745 (patch)
treec9fc141edd75320c0844d028614d4f1a14caad91 /Modules
parentc9506c30f0b9524e1eeee8a7c0176203218ed310 (diff)
downloadCMake-89fb18f54894446270df5de761b8a91854817745.zip
CMake-89fb18f54894446270df5de761b8a91854817745.tar.gz
CMake-89fb18f54894446270df5de761b8a91854817745.tar.bz2
ENH: fix for qtmain
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindQt4.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index d0fc3a1..aaa4fec 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -565,7 +565,6 @@ IF (QT4_QMAKE_FOUND)
SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY_DEBUG})
SET(QT_${basename}_LIBRARIES ${QT_${basename}_LIBRARY_DEBUG})
ENDIF (QT_${basename}_LIBRARY_DEBUG AND NOT QT_${basename}_LIBRARY_RELEASE)
-
IF (QT_${basename}_LIBRARY_DEBUG AND QT_${basename}_LIBRARY_RELEASE)
# if the generator supports configuration types then set
# optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
@@ -594,7 +593,10 @@ IF (QT4_QMAKE_FOUND)
ENDMACRO (_QT4_ADJUST_LIB_VARS)
IF(WIN32)
+ # there is no include for qtmain but adjust macro needs it set
+ SET(QT_QTMAIN_INCLUDE_DIR 1)
_QT4_ADJUST_LIB_VARS(QTMAIN)
+ SET(QT_QTMAIN_INCLUDE_DIR )
ENDIF(WIN32)