[Bf-blender-cvs] [1767a7c9866] master: Fix build error on macOS after recent changes

[Brecht Van Lommel]

Commit: 1767a7c9866fc85b25061c0c3302b1692c49bfb0
Author: Brecht Van Lommel
Date:   Fri Sep 4 19:23:51 2020 +0200
Branches: master
https://developer.blender.org/rB1767a7c9866fc85b25061c0c3302b1692c49bfb0

Fix build error on macOS after recent changes

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

M	intern/cycles/cmake/macros.cmake
M	intern/cycles/test/render_graph_finalize_test.cpp

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

diff --git a/intern/cycles/cmake/macros.cmake b/intern/cycles/cmake/macros.cmake
index 1a2a730a665..c19f37ad853 100644
--- a/intern/cycles/cmake/macros.cmake
+++ b/intern/cycles/cmake/macros.cmake
@@ -391,7 +391,7 @@ macro(cycles_target_link_libraries target)
     target_link_libraries(${target} bf_intern_numaapi)
   endif()
 
-  if(UNIX)
+  if(UNIX AND NOT APPLE)
     if(CYCLES_STANDALONE_REPOSITORY)
       target_link_libraries(${target} extern_libc_compat)
     else()
diff --git a/intern/cycles/test/render_graph_finalize_test.cpp b/intern/cycles/test/render_graph_finalize_test.cpp
index 4ea3470cda8..f0d5804aee9 100644
--- a/intern/cycles/test/render_graph_finalize_test.cpp
+++ b/intern/cycles/test/render_graph_finalize_test.cpp
@@ -419,8 +419,8 @@ TEST_F(RenderGraph, constant_fold_mix_add)
                     .set(&MixNode::type, NODE_MIX_ADD)
                     .set(&MixNode::use_clamp, false)
                     .set("Fac", 0.8f)
-                    .set("Color1", make_float3(0.3, 0.5, 0.7))
-                    .set("Color2", make_float3(0.4, 0.8, 0.9)))
+                    .set("Color1", make_float3(0.3f, 0.5f, 0.7f))
+                    .set("Color2", make_float3(0.4f, 0.8f, 0.9f)))
       .output_color("MixAdd::Color");
 
   graph.finalize(scene);
@@ -440,8 +440,8 @@ TEST_F(RenderGraph, constant_fold_mix_add_clamp)
                     .set(&MixNode::type, NODE_MIX_ADD)
                     .set(&MixNode::use_clamp, true)
                     .set("Fac", 0.8f)
-                    .set("Color1", make_float3(0.3, 0.5, 0.7))
-                    .set("Color2", make_float3(0.4, 0.8, 0.9)))
+                    .set("Color1", make_float3(0.3f, 0.5f, 0.7f))
+                    .set("Color2", make_float3(0.4f, 0.8f, 0.9f)))
       .output_color("MixAdd::Color");
 
   graph.finalize(scene);