mirror of
https://github.com/ModOrganizer2/cmake_common.git
synced 2026-07-27 14:06:46 -07:00
Use Python debug executable when needed. (#28)
This commit is contained in:
+11
-4
@@ -16,6 +16,8 @@ function(mo2_python_uifiles TARGET)
|
||||
return()
|
||||
endif()
|
||||
|
||||
mo2_find_python_executable(PYTHON_EXE)
|
||||
|
||||
message(DEBUG "generating .py from ui files: ${MO2_FILES}")
|
||||
|
||||
set(pyui_files "")
|
||||
@@ -30,7 +32,7 @@ function(mo2_python_uifiles TARGET)
|
||||
set(output "${folder}/${name}.py")
|
||||
add_custom_command(
|
||||
OUTPUT "${output}"
|
||||
COMMAND ${PYTHON_ROOT}/PCbuild/amd64/python.exe
|
||||
COMMAND ${PYTHON_EXE}
|
||||
-I
|
||||
-m PyQt${QT_MAJOR_VERSION}.uic.pyuic
|
||||
-o "${output}"
|
||||
@@ -68,6 +70,8 @@ function(mo2_python_rcfiles TARGET)
|
||||
return()
|
||||
endif()
|
||||
|
||||
mo2_find_python_executable(PYTHON_EXE)
|
||||
|
||||
message(DEBUG "generating .py from qrc files: ${MO2_FILES}")
|
||||
|
||||
set(pyrc_files "")
|
||||
@@ -84,7 +88,7 @@ function(mo2_python_rcfiles TARGET)
|
||||
set(output "${folder}/${name}_rc.py")
|
||||
add_custom_command(
|
||||
OUTPUT "${output}"
|
||||
COMMAND ${PYTHON_ROOT}/PCbuild/amd64/python.exe
|
||||
COMMAND ${PYTHON_EXE}
|
||||
-I
|
||||
-m PyQt5.pyrcc_main
|
||||
-o "${output}"
|
||||
@@ -121,12 +125,14 @@ function(mo2_python_pip_install TARGET)
|
||||
message(FATAL_ERROR "must specified a DIRECTORY for pip install")
|
||||
endif()
|
||||
|
||||
mo2_find_python_executable(PYTHON_EXE)
|
||||
|
||||
string(MAKE_C_IDENTIFIER "${MO2_PACKAGES}" PIP_FILE_LOG)
|
||||
set(pip_log_file "${CMAKE_CURRENT_BINARY_DIR}/${PIP_FILE_LOG}.log")
|
||||
|
||||
add_custom_command(
|
||||
OUTPUT "${pip_log_file}"
|
||||
COMMAND ${PYTHON_ROOT}/PCbuild/amd64/python.exe
|
||||
COMMAND ${PYTHON_EXE}
|
||||
-I
|
||||
-m pip
|
||||
install --force --upgrade --disable-pip-version-check
|
||||
@@ -153,9 +159,10 @@ endfunction()
|
||||
function(mo2_python_requirements TARGET)
|
||||
cmake_parse_arguments(MO2 "" "LIBDIR" "" ${ARGN})
|
||||
|
||||
mo2_find_python_executable(PYTHON_EXE)
|
||||
add_custom_command(
|
||||
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/pip.log"
|
||||
COMMAND ${PYTHON_ROOT}/PCbuild/amd64/python.exe
|
||||
COMMAND ${PYTHON_EXE}
|
||||
-I
|
||||
-m pip
|
||||
install --force --upgrade --disable-pip-version-check
|
||||
|
||||
+13
-1
@@ -18,6 +18,17 @@ function (mo2_set_if_not_defined NAME VALUE)
|
||||
endif()
|
||||
endfunction()
|
||||
|
||||
#! mo2_find_python_executable : find the full path to the Python executable
|
||||
#
|
||||
# \param:VARNAME name of the variable that will contain the path to Python
|
||||
function(mo2_find_python_executable VARNAME)
|
||||
if (EXISTS "${PYTHON_ROOT}/PCbuild/amd64/python_d.exe")
|
||||
set(${VARNAME} "${PYTHON_ROOT}/PCbuild/amd64/python_d.exe" PARENT_SCOPE)
|
||||
else()
|
||||
set(${VARNAME} "${PYTHON_ROOT}/PCbuild/amd64/python.exe" PARENT_SCOPE)
|
||||
endif()
|
||||
endfunction()
|
||||
|
||||
#! mo2_set_project_to_run_from_install : set a target to run from a given executable
|
||||
#
|
||||
# this function is only meaningful for VS generator
|
||||
@@ -244,7 +255,8 @@ function(mo2_add_lupdate TARGET)
|
||||
set(lupdate_command ${QT_ROOT}/bin/lupdate)
|
||||
set(lupdate_args ${MO2_SOURCES} -ts ${MO2_TS_FILE})
|
||||
else()
|
||||
set(lupdate_command ${PYTHON_ROOT}/PCbuild/amd64/python.exe)
|
||||
mo2_find_python_executable(PYTHON_EXE)
|
||||
set(lupdate_command ${PYTHON_EXE})
|
||||
set(lupdate_args -I -m PyQt${QT_MAJOR_VERSION}.lupdate.pylupdate --ts "${MO2_TS_FILE}" ${translation_files})
|
||||
endif()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user