From 6cf7c685099ce3e3a29a4d0ec47c600ed231960e Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 25 Nov 2008 09:45:15 +0000 Subject: [PATCH] [E.A.] Search for SIP_ROOT only if SIP_EXECUTABLE is defined (idem for PYUIC_ROOT) --- adm_local/cmake_files/FindSIPPYQT.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/adm_local/cmake_files/FindSIPPYQT.cmake b/adm_local/cmake_files/FindSIPPYQT.cmake index 844e26dca..07203df5d 100644 --- a/adm_local/cmake_files/FindSIPPYQT.cmake +++ b/adm_local/cmake_files/FindSIPPYQT.cmake @@ -2,16 +2,20 @@ FIND_PROGRAM(SIP_EXECUTABLE sip) SET(SIP_ROOT ${SIP_EXECUTABLE}) +IF(SIP_ROOT) GET_FILENAME_COMPONENT(SIP_ROOT ${SIP_ROOT} PATH) GET_FILENAME_COMPONENT(SIP_ROOT ${SIP_ROOT} PATH) +ENDIF(SIP_ROOT) SET(SIP_INCLUDES -I${SIP_ROOT}/include/python${PYTHON_VERSION}) FIND_PROGRAM(PYUIC_EXECUTABLE pyuic4) SET(PYUIC_ROOT ${PYUIC_EXECUTABLE}) +IF(PYUIC_ROOT) 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) -- 2.39.2