proper detection of PyQt4 with no env set

diff --git a/adm_local/cmake_files/FindPyQt4.cmake b/adm_local/cmake_files/FindPyQt4.cmake
index a7f0349ac12cec383932eab086b56d836c555145..f48e7258b2548c174d31cc03e01b1fadfaa4f856 100644 (file)
--- a/adm_local/cmake_files/FindPyQt4.cmake
+++ b/adm_local/cmake_files/FindPyQt4.cmake
@@ -69,9 +69,16 @@ ENDIF()
 MARK_AS_ADVANCED(PYQT_SIP_MAIN_FILE)
 
 # Get PyQt compilation flags:
-SET(PYQT_PYTHONPATH "${_tmp_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages")
+SET(PYQT_PYTHONPATH "${_tmp_ROOT_DIR};${_tmp_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages")
 SET(PYQT_SIPFLAGS)
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; 
+
+IF(WIN32 AND NOT CYGWIN)
+  SET(_cmd set PYTHONPATH=${PYQT_PYTHONPATH};${SIP_PYTHONPATH};%PYTHONPATH% && ${PYTHON_EXECUTABLE})
+ELSE()
+  SET(_cmd /usr/bin/env PYTHONPATH="${PYQT_PYTHONPATH}:${SIP_PYTHONPATH}:$$PYTHONPATH" ${PYTHON_EXECUTABLE})
+ENDIF()
+
+EXECUTE_PROCESS(COMMAND "${_cmd}" -c "import sys; 
 sys.path[:0] = ['${PYQT_PYTHONPATH}'] 
 sys.path[:0] = ['${SIP_PYTHONPATH}']
 from PyQt4 import pyqtconfig;