Commit: 4e732b9860130f1736baac33a9d868a0a76fab75
Author: Campbell Barton
Date: Mon Sep 8 11:22:40 2014 +1000
Branches: master
https://developer.blender.org/rB4e732b9860130f1736baac33a9d868a0a76fab75
Fix building as Python module (manpage-generation)
===================================================================
M source/blender/python/mathutils/mathutils_Matrix.c
M source/creator/CMakeLists.txt
===================================================================
diff --git a/source/blender/python/mathutils/mathutils_Matrix.c
b/source/blender/python/mathutils/mathutils_Matrix.c
index 675234f..282f29b 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 b32aa46..6ed87f6 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
)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
