[Bf-blender-cvs] [fbf4fe6963a] master: Fix missing Cycles implicit float/double conversion error with Clang

Brecht Van Lommel noreply at git.blender.org
Tue Nov 16 23:25:34 CET 2021


Commit: fbf4fe6963a44aa5d8e66035e5c1e641285a9423
Author: Brecht Van Lommel
Date:   Tue Nov 16 22:46:24 2021 +0100
Branches: master
https://developer.blender.org/rBfbf4fe6963a44aa5d8e66035e5c1e641285a9423

Fix missing Cycles implicit float/double conversion error with Clang

Since these are errors with GCC and Visual Studio.

===================================================================

M	intern/cycles/CMakeLists.txt

===================================================================

diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index 1500743763b..64fe70c886d 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -341,6 +341,9 @@ if(CMAKE_COMPILER_IS_GNUCXX)
   unset(_has_cxxflag_float_conversion)
   unset(_has_cxxflag_double_promotion)
   unset(_has_no_error_unused_macros)
+elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
+  ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_implicit_float_conversion "-Werror=implicit-float-conversion")
+  unset(_has_cxxflag_implicit_float_conversion)
 endif()
 
 if(WITH_CYCLES_CUDA_BINARIES AND (NOT WITH_CYCLES_CUBIN_COMPILER))



More information about the Bf-blender-cvs mailing list