Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2021-02-12 16:54:08 +0300
committerSybren A. Stüvel <sybren@blender.org>2021-02-12 16:54:08 +0300
commit7db00556fa9a14f8617c2ec1e35ae834689f0da7 (patch)
tree17569062af5c7fd0766e8f8b98346d652b7b7615
parent780cabb7a8ff8da0313217e7f6c039423fbf4bf7 (diff)
CMake/Deps: fix build of nasm when asciidoc and xmlto are unavailable
Create zero-byte manual page files `nasm.1` and `ndisasm.1` such that nasm's `make install` step succeeds. Installing nasm requires that its manual pages are built. This requires local packages `asciidoc` and `xmlto` to be installed. Not only does `asciidoc` pull in 110 MB of packages (itself + dependencies), there is also no need for these manual pages. Nasm is just used for building other dependencies, and not even part of our precompiled libraries in SVN. Reviewed By: sebbas Differential Revision: https://developer.blender.org/D10396
-rw-r--r--build_files/build_environment/cmake/nasm.cmake9
1 files changed, 9 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/nasm.cmake b/build_files/build_environment/cmake/nasm.cmake
index 51d7ebd8830..6eadfc5e4f0 100644
--- a/build_files/build_environment/cmake/nasm.cmake
+++ b/build_files/build_environment/cmake/nasm.cmake
@@ -27,3 +27,12 @@ ExternalProject_Add(external_nasm
INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/nasm/src/external_nasm/ && make install
INSTALL_DIR ${LIBDIR}/nasm
)
+
+if(UNIX)
+ # `touch nasm.1 ndisasm.1` helps to create the manual pages files, even when
+ # local `asciidoc` and `xmlto` packages are not installed.
+ ExternalProject_Add_Step(external_nasm after_configure
+ COMMAND ${CMAKE_COMMAND} -E touch ${BUILD_DIR}/nasm/src/external_nasm/nasm.1 ${BUILD_DIR}/nasm/src/external_nasm/ndisasm.1
+ DEPENDEES configure
+ )
+endif()