kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

OpenSubdiv: Add CMake option to enable -Werror in subsurf code

Browse Source
This commit is contained in:
Sergey Sharybin 2015-07-30 10:31:22 +02:00
parent 5c7cdfcb42
commit 820d191626
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -230,6 +230,8 @@ option(WITH_COMPOSITOR_WERROR "Treat warnings as errors in compositor code" OFF
mark_as_advanced(WITH_COMPOSITOR_WERROR) mark_as_advanced(WITH_COMPOSITOR_WERROR)
option(WITH_OPENSUBDIV "Enable OpenSubdiv for surface subdivision" OFF) option(WITH_OPENSUBDIV "Enable OpenSubdiv for surface subdivision" OFF)
option(WITH_SUBSURF_WERROR "Treat warnings as errors in subsurf code" OFF)
mark_as_advanced(WITH_COMPOSITOR_WERROR)
# GHOST Windowing Library Options # GHOST Windowing Library Options
option(WITH_GHOST_DEBUG "Enable debugging output for the GHOST library" OFF) option(WITH_GHOST_DEBUG "Enable debugging output for the GHOST library" OFF)

5
intern/opensubdiv/CMakeLists.txt
View File

@ -50,6 +50,11 @@ set(SRC
opensubdiv_partitioned.h opensubdiv_partitioned.h
) )
if(WITH_SUBSURF_WERROR)
ADD_CHECK_C_COMPILER_FLAG(CMAKE_C_FLAGS C_WERROR -Werror)
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS C_WERROR -Werror)
endif()
macro(OPENSUBDIV_DEFINE_COMPONENT component) macro(OPENSUBDIV_DEFINE_COMPONENT component)
if(${${component}}) if(${${component}})
add_definitions(-D${component}) add_definitions(-D${component})

10
source/blender/blenkernel/CMakeLists.txt
View File

@ -505,6 +505,16 @@ if(WITH_OPENSUBDIV)
../../../intern/opensubdiv ../../../intern/opensubdiv
${OPENSUBDIV_INCLUDE_DIRS} ${OPENSUBDIV_INCLUDE_DIRS}
) )
if(WITH_SUBSURF_WERROR)
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
set_source_files_properties(intern/CCGSubSurf.c
intern/CCGSubSurf_legacy.c
intern/CCGSubSurf_opensubdiv.c
intern/CCGSubSurf_opensubdiv_converter.c
intern/CCGSubSurf_util.c
PROPERTIES COMPILE_FLAGS -Werror)
endif()
endif()
endif() endif()
## Warnings as errors, this is too strict! ## Warnings as errors, this is too strict!