diff options
author | Sergey Sharybin <sergey@blender.org> | 2020-09-16 13:44:17 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey@blender.org> | 2020-09-17 12:02:27 +0300 |
commit | 157cd6c6e89cfa65b54537b5df101a5184b84298 (patch) | |
tree | 8833cbd989ec7919ffd3958896a9bc19eda769ed /build_files/build_environment/CMakeLists.txt | |
parent | d377b1fe762c24ee74805ea8c1f666f121399698 (diff) |
Make deps: Compile own nasm for Linux
This solves annoyance that the official RPM repository of nasm requires
newer version of rpm tool compared to what is shipped by default with
centOS 7.
Differential Revision: https://developer.blender.org/D8905
Diffstat (limited to 'build_files/build_environment/CMakeLists.txt')
-rw-r--r-- | build_files/build_environment/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt index f49c6ea238f..fa2b39fccd8 100644 --- a/build_files/build_environment/CMakeLists.txt +++ b/build_files/build_environment/CMakeLists.txt @@ -34,7 +34,7 @@ # Run "make deps" from main Blender directory # # LINUX USAGE: -# Install compiler cmake autoconf automake libtool yasm nasm tcl +# Install compiler cmake autoconf automake libtool yasm tcl # Run "make deps" from main Blender directory # #################################################################################################### @@ -75,6 +75,8 @@ include(cmake/llvm.cmake) include(cmake/clang.cmake) if(APPLE) include(cmake/openmp.cmake) +endif() +if(UNIX) include(cmake/nasm.cmake) endif() include(cmake/openimageio.cmake) |