bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix building as Python module (manpage-generation)

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/python/mathutils/mathutils_Matrix.c
View File

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

34
source/creator/CMakeLists.txt
View File

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