[Bf-blender-cvs] [392d5de] master: Fix '-Werror=float-conversion' error with gcc < 4.9, for CMake
Bastien Montagne
noreply at git.blender.org
Sat May 3 10:56:01 CEST 2014
Commit: 392d5de0aa2f901892b651ad37e44b1d289cf344
Author: Bastien Montagne
Date: Sat May 3 10:54:02 2014 +0200
https://developer.blender.org/rB392d5de0aa2f901892b651ad37e44b1d289cf344
Fix '-Werror=float-conversion' error with gcc < 4.9, for CMake
Scons is still TODO.
===================================================================
M intern/cycles/CMakeLists.txt
===================================================================
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index 50fd195..a1b0030 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -128,8 +128,9 @@ include_directories(
# Warnings
-if(CMAKE_COMPILER_IS_GNUCC)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=float-conversion")
+if(CMAKE_COMPILER_IS_GNUCXX)
+ ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion")
+ unset(_has_cxxflag_float_conversion)
endif()
More information about the Bf-blender-cvs
mailing list