summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-09-10 15:29:52 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-09-10 15:29:52 (GMT)
commitfe0e9a35cec24f653c60f48b9f0250aec7e5000b (patch)
treeb4949b9c207aedc6671e2c3734b4f5bfabec70f9 /Modules
parente07e02d8c0fab3d952c2e87fc7a916c139292645 (diff)
parent96a8890c7d5c8fed7b5c48bc9640c94f8fd66761 (diff)
downloadCMake-fe0e9a35cec24f653c60f48b9f0250aec7e5000b.zip
CMake-fe0e9a35cec24f653c60f48b9f0250aec7e5000b.tar.gz
CMake-fe0e9a35cec24f653c60f48b9f0250aec7e5000b.tar.bz2
Merge topic 'FindSWIG-noproxy'
96a8890c FindSWIG: Do not generate erroneous outputs with -noproxy
Diffstat (limited to 'Modules')
-rw-r--r--Modules/UseSWIG.cmake10
1 files changed, 6 insertions, 4 deletions
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 96b0b35..d757f65 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -153,10 +153,12 @@ macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
else()
set(swig_outdir ${CMAKE_CURRENT_BINARY_DIR})
endif()
- SWIG_GET_EXTRA_OUTPUT_FILES(${SWIG_MODULE_${name}_LANGUAGE}
- swig_extra_generated_files
- "${swig_outdir}"
- "${swig_source_file_fullname}")
+ if (NOT SWIG_MODULE_${name}_NOPROXY)
+ SWIG_GET_EXTRA_OUTPUT_FILES(${SWIG_MODULE_${name}_LANGUAGE}
+ swig_extra_generated_files
+ "${swig_outdir}"
+ "${swig_source_file_fullname}")
+ endif()
set(swig_generated_file_fullname
"${swig_outdir}/${swig_source_file_name_we}")
# add the language into the name of the file (i.e. TCL_wrap)