1 files changed, 18 insertions, 21 deletions
diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt
index 0f6b435813f..c6c992008a0 100644
--- a/intern/cycles/test/CMakeLists.txt
+++ b/intern/cycles/test/CMakeLists.txt
@@ -20,31 +20,24 @@ if(WITH_GTESTS)
 endif()
 
 set(INC
-  .
   ..
-  ../device
-  ../graph
-  ../kernel
-  ../render
-  ../util
 )
 
 set(ALL_CYCLES_LIBRARIES
-  cycles_device
   cycles_kernel
   cycles_integrator
-  cycles_render
+  cycles_scene
+  cycles_session
   cycles_bvh
   cycles_graph
   cycles_subd
+  cycles_device
   cycles_util
   extern_clew
   ${CYCLES_GL_LIBRARIES}
 )
 include_directories(${INC})
 
-cycles_link_directories()
-
 set(SRC
   integrator_adaptive_sampling_test.cpp
   integrator_render_scheduler_test.cpp
@@ -59,17 +52,21 @@ set(SRC
   util_transform_test.cpp
 )
 
-if(CXX_HAS_AVX)
-  list(APPEND SRC
-    util_avxf_avx_test.cpp
-  )
-  set_source_files_properties(util_avxf_avx_test.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX_KERNEL_FLAGS}")
-endif()
-if(CXX_HAS_AVX2)
-  list(APPEND SRC
-    util_avxf_avx2_test.cpp
-  )
-  set_source_files_properties(util_avxf_avx2_test.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX2_KERNEL_FLAGS}")
+# Disable AVX tests on macOS. Rosetta has problems running them, and other
+# platforms should be enough to verify AVX operations are implemented correctly.
+if(NOT APPLE)
+  if(CXX_HAS_AVX)
+    list(APPEND SRC
+      util_avxf_avx_test.cpp
+    )
+    set_source_files_properties(util_avxf_avx_test.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX_KERNEL_FLAGS}")
+  endif()
+  if(CXX_HAS_AVX2)
+    list(APPEND SRC
+      util_avxf_avx2_test.cpp
+    )
+    set_source_files_properties(util_avxf_avx2_test.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX2_KERNEL_FLAGS}")
+  endif()
 endif()
 
 if(WITH_GTESTS)