kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'FindSWIG-noproxy' 

96a8890c FindSWIG: Do not generate erroneous outputs with -noproxy
This commit is contained in:
Brad King 2015-09-10 11:29:52 -04:00 committed by CMake Topic Stage
parent e07e02d8c0 96a8890c7d
commit fe0e9a35ce
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/UseSWIG.cmake
View File

@ -153,10 +153,12 @@ macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
else() else()
set(swig_outdir ${CMAKE_CURRENT_BINARY_DIR}) set(swig_outdir ${CMAKE_CURRENT_BINARY_DIR})
endif() endif()
if (NOT SWIG_MODULE_${name}_NOPROXY)
SWIG_GET_EXTRA_OUTPUT_FILES(${SWIG_MODULE_${name}_LANGUAGE} SWIG_GET_EXTRA_OUTPUT_FILES(${SWIG_MODULE_${name}_LANGUAGE}
swig_extra_generated_files swig_extra_generated_files
"${swig_outdir}" "${swig_outdir}"
"${swig_source_file_fullname}") "${swig_source_file_fullname}")
endif()
set(swig_generated_file_fullname set(swig_generated_file_fullname
"${swig_outdir}/${swig_source_file_name_we}") "${swig_outdir}/${swig_source_file_name_we}")
# add the language into the name of the file (i.e. TCL_wrap) # add the language into the name of the file (i.e. TCL_wrap)