[Bf-blender-cvs] [c27cab268bf] master: Fix Windows compiler warning using WITH_CYCLES_NATIVE_ONLY.
Brecht Van Lommel
noreply at git.blender.org
Thu Jan 11 00:07:31 CET 2018
Commit: c27cab268bf39594766b5cfba7a90e87065a4bb6
Author: Brecht Van Lommel
Date: Tue Jan 9 22:50:48 2018 +0100
Branches: master
https://developer.blender.org/rBc27cab268bf39594766b5cfba7a90e87065a4bb6
Fix Windows compiler warning using WITH_CYCLES_NATIVE_ONLY.
===================================================================
M intern/cycles/CMakeLists.txt
===================================================================
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index dbf1bcece16..543fb5b2cf8 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -21,8 +21,11 @@ if(WITH_CYCLES_NATIVE_ONLY)
add_definitions(
-DWITH_KERNEL_NATIVE
)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
- set(CYCLES_KERNEL_FLAGS "-march=native")
+
+ if(NOT MSVC)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+ set(CYCLES_KERNEL_FLAGS "-march=native")
+ endif()
elseif(NOT WITH_CPU_SSE)
set(CXX_HAS_SSE FALSE)
set(CXX_HAS_AVX FALSE)
More information about the Bf-blender-cvs
mailing list