From 9e51ed359a9071a12b7a4d012fb1925bb41377b0 Mon Sep 17 00:00:00 2001 From: ana Date: Fri, 22 Oct 2010 07:09:47 +0000 Subject: [PATCH] *** empty log message *** --- adm_local/cmake_files/FindSIPPYQT.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/adm_local/cmake_files/FindSIPPYQT.cmake b/adm_local/cmake_files/FindSIPPYQT.cmake index 84ac4c878..448e6a980 100644 --- a/adm_local/cmake_files/FindSIPPYQT.cmake +++ b/adm_local/cmake_files/FindSIPPYQT.cmake @@ -63,8 +63,11 @@ SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtAssistant -I${PYQT_SIPS}/QtD SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtNetwork -I${PYQT_SIPS}/QtSql) SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtSvg -I${PYQT_SIPS}/QtTest) -SET(qt_flag ${QTVERSION}) -STRING(REPLACE "." "_" qt_flag ${qt_flag}) +file(READ ${PYQT_SIPS}/QtCore/QtCoremod.sip SUPPORTED) +STRING(REGEX MATCH "Qt_[0-9]_[0-9]_[0-9]}" SUPPORTED ${SUPPORTED}) +STRING(LENGTH ${SUPPORTED} len) +MATH(EXPR len "${len}-1") +STRING(SUBSTRING ${SUPPORTED} 0 ${len} SUPPORTED) IF(WINDOWS) SET(ws_flag WS_WIN) @@ -72,5 +75,5 @@ ELSE(WINDOWS) SET(ws_flag WS_X11) ENDIF(WINDOWS) -SET(PYQT_SIPFLAGS -x VendorID -x PyQt_NoPrintRangeBug -t ${ws_flag} -t Qt_${qt_flag} -g -s .cc -c .) +SET(PYQT_SIPFLAGS -x VendorID -x PyQt_NoPrintRangeBug -t ${ws_flag} -t ${SUPPORTED} -g -s .cc -c .) SET(PYQT_SIPFLAGS ${PYQT_SIPFLAGS} ${PYQT_INCLUDES}) -- 2.39.2