Skip to content

Commit 09f6b91

Browse files
committedMar 17, 2016
* fix pyuic wrapper on windows
* fix PyQt wrapper installation on precise
1 parent 5c3c99c commit 09f6b91

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed
 

‎python/PyQt/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ELSE(ENABLE_QT5)
2929
ENDIF(ENABLE_QT5)
3030

3131
FOREACH(pyfile ${PYQT_COMPAT_FILES})
32-
GET_FILENAME_COMPONENT(_dir ${pyfile} DIRECTORY)
32+
GET_FILENAME_COMPONENT(_dir ${pyfile} PATH)
3333
SET(pyfile ${PYQT_PREFIX}/${pyfile})
3434
LIST(APPEND PYQT_COMPAT_FILES_PREFIXED ${pyfile})
3535
ADD_CUSTOM_COMMAND(TARGET pyqtcompat

‎scripts/pyuic-wrapper.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
set PYUIC4=%1
33
set PATH=%2;%PATH%
44
set PYTHONPATH=%3;%PYTHONPATH%
5-
%PYUIC4% %5 %6 %7 %8 %9
5+
set PYTHON=%4
6+
%PYTHON% %~dp0\pyuic-wrapper.py %5 %6 %7 %8 %9

0 commit comments

Comments
 (0)
Failed to load comments.