|
|
@@ -641,14 +641,14 @@ endif(CEF_BIN_DIR)
|
|
|
if(NOT MSVC)
|
|
|
# ͨ¹ýPython makedown Éú³ÉChagneLogµÄÍøÒ³Îļþ
|
|
|
set(CHANGELOG_HTML_PATH ${CMAKE_CURRENT_BINARY_DIR}/ChangeLog.html)
|
|
|
- execute_process(COMMAND python --version
|
|
|
+ execute_process(COMMAND python3 --version
|
|
|
RESULT_VARIABLE return_code
|
|
|
OUTPUT_VARIABLE PYTHON_VERSION_OUTPUT
|
|
|
ERROR_VARIABLE PYTHON_VERSION_OUTPUT)
|
|
|
if("${return_code}" STREQUAL "0")
|
|
|
- message("python version: ${return_code} =~= ${PYTHON_VERSION_OUTPUT}")
|
|
|
+ message("python3 version: ${return_code} =~= ${PYTHON_VERSION_OUTPUT}")
|
|
|
# execute_process(COMMAND "which pip" COMMAND "pip" COMMAND "type pip" COMMAND "hash -r")
|
|
|
- execute_process(COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/md2html.py
|
|
|
+ execute_process(COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/md2html.py
|
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog ${CHANGELOG_HTML_PATH}
|
|
|
RESULT_VARIABLE return_code
|
|
|
OUTPUT_VARIABLE PYTHON_MARKDOWN_OUTPUT
|
|
|
@@ -657,13 +657,13 @@ if(NOT MSVC)
|
|
|
string(FIND "${PYTHON_MARKDOWN_ERROR}" "No module named markdown" CheckPos)
|
|
|
if("${return_code}" STREQUAL "1" AND NOT ("${CheckPos}" STREQUAL "-1"))
|
|
|
message(WARN "install markdown by pip...")
|
|
|
- execute_process(COMMAND "pip install markdown"
|
|
|
+ execute_process(COMMAND "pip3 install markdown"
|
|
|
RESULT_VARIABLE return_code
|
|
|
OUTPUT_VARIABLE PYTHON_MARKDOWN_OUTPUT
|
|
|
ERROR_VARIABLE PYTHON_MARKDOWN_ERROR)
|
|
|
message(WARN "install markdown: ${return_code} =$= ${PYTHON_MARKDOWN_OUTPUT} == ${PYTHON_MARKDOWN_ERROR}")
|
|
|
if("${return_code}" STREQUAL "0")
|
|
|
- execute_process(COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/md2html.py
|
|
|
+ execute_process(COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/md2html.py
|
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog ${CHANGELOG_HTML_PATH}
|
|
|
RESULT_VARIABLE return_code
|
|
|
OUTPUT_VARIABLE PYTHON_MARKDOWN_OUTPUT
|
gifur