From d3283ef1210fe63f75a3b1a60efa3abe5763e6ad Mon Sep 17 00:00:00 2001
From: Ray Molenkamp <github@lazydodo.com>
Date: Thu, 25 Jun 2020 12:44:39 +0200
Subject: Build: upgrade OpenImageDenoise to 1.2.1

This requires ISPC for building OpenImageDenoise, so that is now added as
a dependency as well. Blender itself does not need ISPC for building so it
is not included as part of the precompiled libraries.

Differential Revision: https://developer.blender.org/D7641
---
 build_files/build_environment/cmake/ispc.cmake | 62 ++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 build_files/build_environment/cmake/ispc.cmake

(limited to 'build_files/build_environment/cmake/ispc.cmake')

diff --git a/build_files/build_environment/cmake/ispc.cmake b/build_files/build_environment/cmake/ispc.cmake
new file mode 100644
index 00000000000..1896c85bc88
--- /dev/null
+++ b/build_files/build_environment/cmake/ispc.cmake
@@ -0,0 +1,62 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+if(WIN32)
+  set(ISPC_EXTRA_ARGS_WIN
+    -DFLEX_EXECUTABLE=${LIBDIR}/flexbison/win_flex.exe
+    -DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe
+    -DM4_EXECUTABLE=${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/m4.exe
+  )
+endif()
+
+set(ISPC_EXTRA_ARGS
+    -DARM_ENABLED=Off
+    -DISPC_NO_DUMPS=On
+    -DISPC_INCLUDE_EXAMPLES=Off
+    -DISPC_INCLUDE_TESTS=Off
+    -DLLVM_ROOT=${LIBDIR}/llvm/lib/cmake/llvm
+    -DCLANG_EXECUTABLE=${LIBDIR}/clang/bin/clang
+    -DISPC_INCLUDE_TESTS=Off
+    -DCLANG_LIBRARY_DIR=${LIBDIR}/clang/lib
+    -DCLANG_INCLUDE_DIRS=${LIBDIR}/clang/include
+    ${ISPC_EXTRA_ARGS_WIN}
+)
+
+ExternalProject_Add(external_ispc
+  URL ${ISPC_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${ISPC_HASH}
+  PREFIX ${BUILD_DIR}/ispc
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/ispc/src/external_ispc < ${PATCH_DIR}/ispc.diff
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ispc -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${ISPC_EXTRA_ARGS} ${BUILD_DIR}/ispc/src/external_ispc
+  INSTALL_DIR ${LIBDIR}/ispc
+)
+
+add_dependencies(
+  external_ispc
+  ll
+  external_clang
+)
+
+if(WIN32)
+  add_dependencies(
+    external_ispc
+    external_flexbison
+  )
+endif()
+
-- 
cgit v1.2.3


From 0d2e628964763a5ad872d51aec07bd551cbb2272 Mon Sep 17 00:00:00 2001
From: Stefan Werner <stefan.werner@tangent-animation.com>
Date: Mon, 29 Jun 2020 14:04:12 +0200
Subject: Build: Point ISPC explicitly to the location of LLVM libraries.

Sometimes the ISPC build could pick up the system LLVM librareis
instead of the ones in the Blender lib directory.
---
 build_files/build_environment/cmake/ispc.cmake | 1 +
 1 file changed, 1 insertion(+)

(limited to 'build_files/build_environment/cmake/ispc.cmake')

diff --git a/build_files/build_environment/cmake/ispc.cmake b/build_files/build_environment/cmake/ispc.cmake
index 1896c85bc88..0bb5db82aea 100644
--- a/build_files/build_environment/cmake/ispc.cmake
+++ b/build_files/build_environment/cmake/ispc.cmake
@@ -30,6 +30,7 @@ set(ISPC_EXTRA_ARGS
     -DISPC_INCLUDE_EXAMPLES=Off
     -DISPC_INCLUDE_TESTS=Off
     -DLLVM_ROOT=${LIBDIR}/llvm/lib/cmake/llvm
+    -DLLVM_LIBRARY_DIR=${LIBDIR}/llvm/lib
     -DCLANG_EXECUTABLE=${LIBDIR}/clang/bin/clang
     -DISPC_INCLUDE_TESTS=Off
     -DCLANG_LIBRARY_DIR=${LIBDIR}/clang/lib
-- 
cgit v1.2.3