Skip to content

Commit b1eb812

Browse files
committedNov 19, 2015
Do not require manual CMakeCache intervention
1 parent 8e5ba3b commit b1eb812

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed
 

‎cmake/FindPyQt4.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ IF(EXISTS PYQT4_VERSION)
2727
SET(PYQT4_FOUND TRUE)
2828
ELSE(EXISTS PYQT4_VERSION)
2929

30-
FIND_FILE(_find_pyqt_py FindPyQt4.py PATHS ${CMAKE_MODULE_PATH})
30+
FIND_FILE(_find_pyqt4_py FindPyQt4.py PATHS ${CMAKE_MODULE_PATH})
3131

32-
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_pyqt_py} OUTPUT_VARIABLE pyqt_config)
32+
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_pyqt4_py} OUTPUT_VARIABLE pyqt_config)
3333
IF(pyqt_config)
3434
STRING(REGEX REPLACE "^pyqt_version:([^\n]+).*$" "\\1" PYQT4_VERSION ${pyqt_config})
3535
STRING(REGEX REPLACE ".*\npyqt_version_str:([^\n]+).*$" "\\1" PYQT4_VERSION_STR ${pyqt_config})

‎cmake/FindPyQt5.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ IF(EXISTS PYQT5_VERSION)
2727
SET(PYQT5_FOUND TRUE)
2828
ELSE(EXISTS PYQT5_VERSION)
2929

30-
FIND_FILE(_find_pyqt_py FindPyQt5.py PATHS ${CMAKE_MODULE_PATH})
30+
FIND_FILE(_find_pyqt5_py FindPyQt5.py PATHS ${CMAKE_MODULE_PATH})
3131

32-
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_pyqt_py} OUTPUT_VARIABLE pyqt_config)
32+
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_pyqt5_py} OUTPUT_VARIABLE pyqt_config)
3333
IF(pyqt_config)
3434
STRING(REGEX REPLACE "^pyqt_version:([^\n]+).*$" "\\1" PYQT5_VERSION ${pyqt_config})
3535
STRING(REGEX REPLACE ".*\npyqt_version_str:([^\n]+).*$" "\\1" PYQT5_VERSION_STR ${pyqt_config})

0 commit comments

Comments
 (0)
Please sign in to comment.