Commit: 1eecb1feaf21ef1c6e210d610922d70c659cc811
Author: Campbell Barton
Date: Thu Nov 13 14:07:34 2014 +0100
Branches: master
https://developer.blender.org/rB1eecb1feaf21ef1c6e210d610922d70c659cc811
CMake: manpage creation is now optional
===================================================================
M CMakeLists.txt
M source/creator/CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3459030..1babdcf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -329,6 +329,13 @@ endif()
# Unit testsing
option(WITH_GTESTS "Enable GTest unit testing" OFF)
+
+# Documentation
+if(UNIX AND NOT APPLE)
+ option(WITH_DOC_MANPAGE "Create a manual page (Unix manpage)" OFF)
+endif()
+
+
# OpenGL
option(WITH_GLEW_MX "Support multiple GLEW contexts
(experimental)"
OFF )
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 7fcba4d..181571b 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -392,11 +392,14 @@ endif()
if(UNIX AND NOT APPLE)
if(NOT WITH_PYTHON_MODULE)
- add_custom_target(blender_man_page ALL
- COMMAND
${CMAKE_SOURCE_DIR}/doc/manpage/blender.1.py ${EXECUTABLE_OUTPUT_PATH}/blender
${CMAKE_CURRENT_BINARY_DIR}/blender.1)
-
- add_dependencies(blender_man_page blender)
-
+ if(WITH_DOC_MANPAGE)
+ add_custom_target(
+ blender_man_page ALL
+ COMMAND
${CMAKE_SOURCE_DIR}/doc/manpage/blender.1.py
+ ${EXECUTABLE_OUTPUT_PATH}/blender
+ ${CMAKE_CURRENT_BINARY_DIR}/blender.1)
+ add_dependencies(blender_man_page blender)
+ endif()
endif()
# there are a few differences between portable and system install
@@ -404,10 +407,12 @@ if(UNIX AND NOT APPLE)
if(WITH_PYTHON_MODULE)
# pass
else()
- install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/blender.1
- DESTINATION "."
- )
+ if(WITH_DOC_MANPAGE)
+ install(
+ FILES
${CMAKE_CURRENT_BINARY_DIR}/blender.1
+ DESTINATION "."
+ )
+ endif()
endif()
install(
TARGETS blender
@@ -444,11 +449,13 @@ if(UNIX AND NOT APPLE)
TARGETS blender
DESTINATION bin
)
- # manpage only with 'blender' binary
- install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/blender.1
- DESTINATION share/man/man1
- )
+ if(WITH_DOC_MANPAGE)
+ # manpage only with 'blender' binary
+ install(
+ FILES
${CMAKE_CURRENT_BINARY_DIR}/blender.1
+ DESTINATION share/man/man1
+ )
+ endif()
endif()
# misc files
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
