diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-22 09:25:19 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-22 09:25:19 -0700 |
| commit | 7ed6005b9282f628754de9fdd565260805be4abe (patch) | |
| tree | 4e0bf3d34348e90a1af851e03acd9eef36d85a6e /cmake | |
| parent | 1931bd386ec0d68535f7eae7ecf717568ec0dd85 (diff) | |
| parent | 99d24d23e95ea0235a8ea2957c289461625765a3 (diff) | |
Merge branch 'next' into python3
Conflicts:
cmake/Modules/GrSwig.cmake
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GrSwig.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/UseSWIG.cmake | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake index cc6860cb38..d6103ec9af 100644 --- a/cmake/Modules/GrSwig.cmake +++ b/cmake/Modules/GrSwig.cmake @@ -184,10 +184,6 @@ macro(GR_SWIG_MAKE name) #setup the swig flags with flags and include directories set(CMAKE_SWIG_FLAGS -fvirtual -modern -keyword -w511 -relativeimport ${py3} -module ${name} ${GR_SWIG_FLAGS}) - foreach(dir ${GR_SWIG_INCLUDE_DIRS}) - list(APPEND CMAKE_SWIG_FLAGS "-I${dir}") - endforeach(dir) - #set the C++ property on the swig .i file so it builds set_source_files_properties(${ifiles} PROPERTIES CPLUSPLUS ON) diff --git a/cmake/Modules/UseSWIG.cmake b/cmake/Modules/UseSWIG.cmake index 05eb9fca1a..a37cc41ae4 100644 --- a/cmake/Modules/UseSWIG.cmake +++ b/cmake/Modules/UseSWIG.cmake @@ -155,6 +155,7 @@ macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile) endif(HAVE_WNO_UNUSED_BUT_SET_VARIABLE) get_directory_property(cmake_include_directories INCLUDE_DIRECTORIES) + list(REMOVE_DUPLICATES cmake_include_directories) set(swig_include_dirs) foreach(it ${cmake_include_directories}) set(swig_include_dirs ${swig_include_dirs} "-I${it}") |