From 0f863afde2dd11774210cb86ae4977d935b755a6 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 26 Feb 2010 15:22:20 +0000 Subject: [PATCH] If PYQT_SIPS is defined, use it ! --- adm_local/cmake_files/FindSIPPYQT.cmake | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/adm_local/cmake_files/FindSIPPYQT.cmake b/adm_local/cmake_files/FindSIPPYQT.cmake index f1526b175..162adfe3b 100644 --- a/adm_local/cmake_files/FindSIPPYQT.cmake +++ b/adm_local/cmake_files/FindSIPPYQT.cmake @@ -46,15 +46,18 @@ GET_FILENAME_COMPONENT(PYUIC_ROOT ${PYUIC_ROOT} PATH) GET_FILENAME_COMPONENT(PYUIC_ROOT ${PYUIC_ROOT} PATH) ENDIF(PYUIC_ROOT) -IF(WINDOWS) - SET(PYQT_SIPS ${PYUIC_ROOT}/sip) -ELSE(WINDOWS) - IF(PYUIC_ROOT STREQUAL /usr) - SET(PYQT_SIPS ${PYUIC_ROOT}/share/sip/PyQt4) - ELSE(PYUIC_ROOT STREQUAL /usr) - SET(PYQT_SIPS ${PYUIC_ROOT}/share/sip) - ENDIF(PYUIC_ROOT STREQUAL /usr) -ENDIF(WINDOWS) +SET(PYQT_SIPS $ENV{PYQT_SIPS}) +IF(NOT PYQT_SIPS) + IF(WINDOWS) + SET(PYQT_SIPS ${PYUIC_ROOT}/sip) + ELSE(WINDOWS) + IF(PYUIC_ROOT STREQUAL /usr) + SET(PYQT_SIPS ${PYUIC_ROOT}/share/sip/PyQt4) + ELSE(PYUIC_ROOT STREQUAL /usr) + SET(PYQT_SIPS ${PYUIC_ROOT}/share/sip) + ENDIF(PYUIC_ROOT STREQUAL /usr) + ENDIF(WINDOWS) +ENDIF(NOT PYQT_SIPS) SET(PYQT_INCLUDES -I${PYQT_SIPS}) SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtCore -I${PYQT_SIPS}/QtGui) -- 2.39.2