[Bf-blender-cvs] [9333bb57eca] cycles_oneapi: CMake Deps: Use self-compiled Flex on Linux
Sergey Sharybin
noreply at git.blender.org
Wed Jun 1 14:55:49 CEST 2022
Commit: 9333bb57eca93dc4c06966ea590c84dc323bf53f
Author: Sergey Sharybin
Date: Wed Jun 1 14:53:46 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rB9333bb57eca93dc4c06966ea590c84dc323bf53f
CMake Deps: Use self-compiled Flex on Linux
Solves compilation error if IGC on centOS 7 where system-wide
Flex is too old and leads to the -Werror=register errors in the
generated code.
===================================================================
M build_files/build_environment/cmake/igc.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/igc.cmake b/build_files/build_environment/cmake/igc.cmake
index cbdad0f2e5a..e8ca0d63eb0 100644
--- a/build_files/build_environment/cmake/igc.cmake
+++ b/build_files/build_environment/cmake/igc.cmake
@@ -1,7 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-or-later
-# CAUTION: igc requires flex 2.6.4 this is not by default available on centos 7
-
unpack_only(igc_llvm)
unpack_only(igc_opencl_clang)
unpack_only(igc_vcintrinsics)
@@ -22,6 +20,13 @@ set(IGC_EXTRA_ARGS
-DIGC_OPTION__ARCHITECTURE_HOST=${IGC_TARGET}
)
+if(UNIX AND NOT APPLE)
+ list(APPEND IGC_EXTRA_ARGS
+ -DFLEX_EXECUTABLE=${LIBDIR}/flex/bin/flex
+ -DFLEX_INCLUDE_DIR=${LIBDIR}/flex/include
+ )
+endif()
+
ExternalProject_Add(external_igc
URL file://${PACKAGE_DIR}/${IGC_FILE}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
@@ -77,3 +82,9 @@ add_dependencies(
external_igc_spirv_translator
)
+if(UNIX AND NOT APPLE)
+ add_dependencies(
+ external_igc
+ external_flex
+ )
+endif()
More information about the Bf-blender-cvs
mailing list