diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-09-08 05:22:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-09-08 05:22:40 +0400 |
| commit | 4e732b9860130f1736baac33a9d868a0a76fab75 (patch) | |
| tree | af7b13b083073f1b87e84b5f5ebced873beb0cbd | |
| parent | da3be518b6c70aa06e5bb5db8ae78d1d6623a306 (diff) | |
Fix building as Python module (manpage-generation)
| -rw-r--r-- | source/blender/python/mathutils/mathutils_Matrix.c | 8 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 34 |
2 files changed, 25 insertions, 17 deletions
diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c index 675234fe3e4..282f29b4934 100644 --- a/source/blender/python/mathutils/mathutils_Matrix.c +++ b/source/blender/python/mathutils/mathutils_Matrix.c @@ -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; } diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index b32aa464d67..6ed87f6596c 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -391,19 +391,26 @@ 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 ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg @@ -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() @@ -469,10 +481,6 @@ if(UNIX AND NOT APPLE) 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 ) |