diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-04-17 17:10:25 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-04-17 17:10:25 -0700 |
| commit | c3a1e3da0916ca136e0f4b6b10b7ecaa12d748aa (patch) | |
| tree | 841594255164a456e0c6e9df996cd183f7765c52 /cmake | |
| parent | 78d9a0b43af94e604840b45a627e3b02979f9a0a (diff) | |
| parent | a8e41811d3d458206314be09fdd0994ac89a281e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GrSwig.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake index b2eabd57d0..de8be5cc19 100644 --- a/cmake/Modules/GrSwig.cmake +++ b/cmake/Modules/GrSwig.cmake @@ -179,7 +179,7 @@ macro(GR_SWIG_MAKE name) list(APPEND SWIG_MODULE_${name}_EXTRA_DEPS ${tag_file}) #setup the swig flags with flags and include directories - set(CMAKE_SWIG_FLAGS -fvirtual -modern -keyword -w511 -module ${name} ${GR_SWIG_FLAGS}) + set(CMAKE_SWIG_FLAGS -fvirtual -modern -keyword -w511 -w314 -module ${name} ${GR_SWIG_FLAGS}) #set the C++ property on the swig .i file so it builds set_source_files_properties(${ifiles} PROPERTIES CPLUSPLUS ON) |