diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-22 09:23:30 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-22 09:23:30 -0700 |
| commit | 99d24d23e95ea0235a8ea2957c289461625765a3 (patch) | |
| tree | 76f2b684acd54450f2af82215e6a2c0841a82321 /cmake | |
| parent | e1e912858be7cb6d199fd5ca30c559e6afc48233 (diff) | |
| parent | 0d5fd62c70f5f633b124732a17ed90b061f94941 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-wxgui/lib/CMakeLists.txt
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GrSwig.cmake | 3 | ||||
| -rw-r--r-- | cmake/Modules/UseSWIG.cmake | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake index c8d4eb466e..b2eabd57d0 100644 --- a/cmake/Modules/GrSwig.cmake +++ b/cmake/Modules/GrSwig.cmake @@ -180,9 +180,6 @@ macro(GR_SWIG_MAKE name) #setup the swig flags with flags and include directories set(CMAKE_SWIG_FLAGS -fvirtual -modern -keyword -w511 -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 b7e3e05dc5..e55543532f 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}") |