Fix building as Python module (manpage-generation)

This commit is contained in:
Campbell Barton
2014-09-08 11:22:40 +10:00
parent da3be518b6
commit 4e732b9860
2 changed files with 25 additions and 17 deletions

View File

@@ -1560,10 +1560,10 @@ static PyObject *Matrix_adjugate(MatrixObject *self)
adjoint_matrix_n(self->matrix, self->matrix, self->num_col); adjoint_matrix_n(self->matrix, self->matrix, self->num_col);
} }
else { else {
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"Matrix adjugate(d): size (%d) unsupported", "Matrix adjugate(d): size (%d) unsupported",
(int)self->num_col); (int)self->num_col);
return NULL; return NULL;
} }

View File

@@ -391,18 +391,25 @@ endif()
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
install( if(NOT WITH_PYTHON_MODULE)
CODE install(
" CODE
execute_process(COMMAND "
${CMAKE_SOURCE_DIR}/doc/manpage/blender.1.py execute_process(COMMAND
${TARGETDIR}/blender ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1.py
${TARGETDIR}/blender.1) ${TARGETDIR}/blender
" ${TARGETDIR}/blender.1)
) "
)
endif()
# there are a few differences between portable and system install # there are a few differences between portable and system install
if(WITH_INSTALL_PORTABLE) if(WITH_INSTALL_PORTABLE)
install(
FILES ${TARGETDIR}/blender.1
DESTINATION ${TARGETDIR}
)
install( install(
FILES FILES
${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
@@ -434,6 +441,11 @@ if(UNIX AND NOT APPLE)
PROGRAMS ${TARGETDIR}/blender PROGRAMS ${TARGETDIR}/blender
DESTINATION ${CMAKE_INSTALL_PREFIX}/bin DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
) )
# manpage only with 'blender' binary
install(
FILES ${TARGETDIR}/blender.1
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
)
endif() endif()
@@ -468,10 +480,6 @@ if(UNIX AND NOT APPLE)
PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
DESTINATION ${CMAKE_INSTALL_PREFIX}/bin DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
) )
install(
FILES ${TARGETDIR}/blender.1
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
)
install( install(
FILES ${BLENDER_TEXT_FILES} FILES ${BLENDER_TEXT_FILES}
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender