From 4e732b9860130f1736baac33a9d868a0a76fab75 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 8 Sep 2014 11:22:40 +1000 Subject: Fix building as Python module (manpage-generation) --- source/creator/CMakeLists.txt | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) (limited to 'source/creator') 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,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 -- cgit v1.2.3