diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-04-17 17:12:56 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-04-17 17:12:56 -0700 |
| commit | b9058f111aeeae175d7ad1ef68405fe62d29a198 (patch) | |
| tree | 1a33d9bbf2b2d68604a248bbb0824013635e5001 /cmake | |
| parent | 0476c5f73c0d26c221723eb02e7eecc4df9c099c (diff) | |
| parent | 385f0d4b0a5074bc62bacd6366c4b7474db8ef40 (diff) | |
Merge branch 'next' into python3
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 d6103ec9af..8e45c546cd 100644 --- a/cmake/Modules/GrSwig.cmake +++ b/cmake/Modules/GrSwig.cmake @@ -182,7 +182,7 @@ macro(GR_SWIG_MAKE name) endif (PYTHON3) #setup the swig flags with flags and include directories - set(CMAKE_SWIG_FLAGS -fvirtual -modern -keyword -w511 -relativeimport ${py3} -module ${name} ${GR_SWIG_FLAGS}) + set(CMAKE_SWIG_FLAGS -fvirtual -modern -keyword -w511 -w314 -relativeimport ${py3} -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) |