mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-20 20:51:40 +00:00
72122beee8
1. This should force the python executable to use the desired encoding. The command is moved to a wrapper script to be able to set the environment at make-run-time. cherry-picked froma68ef98andf3c88842. Python is choking on '\\' cherry-picked from65deb30Omiting changes to ReplaceValues.py, which will be hopefully done by Günter Milde
28 lines
861 B
CMake
28 lines
861 B
CMake
set(ENV{PYTHONIOENCODING} "utf-8")
|
|
|
|
# check if all needed variables are set
|
|
foreach(_v LYX_USERDIR_VER LYX_DIR_VER REL_DIR SOURCE CREATED LYX_PYTHON_EXECUTABLE)
|
|
if (NOT DEFINED ${_v})
|
|
message(FATAL_ERROR "${_v} not set")
|
|
else()
|
|
#message(STATUS "${_v}=${${_v}}")
|
|
endif()
|
|
endforeach()
|
|
|
|
set(originstring "origin\ unavailable=origin\ /systemlyxdir/doc/${REL_DIR}")
|
|
#message(STATUS "originstring=${originstring}")
|
|
execute_process(COMMAND ${LYX_PYTHON_EXECUTABLE} "${TOP_CMAKE_PATH}/doc/ReplaceValues.py"
|
|
"LYX_USERDIR_VER=${LYX_USERDIR_VER}"
|
|
"LYX_DIR_VER=${LYX_DIR_VER}"
|
|
${originstring}
|
|
"${TOP_SRC_DIR}/lib/doc/${SOURCE}"
|
|
OUTPUT_FILE "${CREATED}"
|
|
RESULT_VARIABLE _err
|
|
ERROR_VARIABLE lyxerr)
|
|
|
|
if(_err)
|
|
message(STATUS "_err = ${_err}")
|
|
message(STATUS "lyxerr = ${lyxerr}")
|
|
message(FATAL_ERROR "Conversion of ${SOURCE} failed")
|
|
endif()
|