summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorNils Gladitz <nilsgladitz@gmail.com>2015-04-29 13:09:24 (GMT)
committerBrad King <brad.king@kitware.com>2015-04-30 14:20:20 (GMT)
commit32a2f41402d38e1c5be3547bd042328df0b28124 (patch)
tree9991861d5cc2a0966ad3ac1976a3c3d73081b463 /Modules
parentd1a74bba1bba0c4381e7c3a6a93551320dc377ac (diff)
downloadCMake-32a2f41402d38e1c5be3547bd042328df0b28124.zip
CMake-32a2f41402d38e1c5be3547bd042328df0b28124.tar.gz
CMake-32a2f41402d38e1c5be3547bd042328df0b28124.tar.bz2
Revert "add_custom_command: Diagnose MAIN_DEPENDENCY limitation."
This reverts commit 242c3966 (add_custom_command: Diagnose MAIN_DEPENDENCY limitation, 2015-03-09) and the follow up commit b372a99a (UseSWIG: Do not use MAIN_DEPENDENCY on custom commands, 2015-03-26). I misdiagnosed the underlying issue that prompted creation of policy CMP0057. The actual issue surfaces when a single custom command's MAIN_DEPENDENCY is listed in more than one target; this issue will have to be addressed independently.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/UseSWIG.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 1862876..96b0b35 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -204,7 +204,8 @@ macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
${swig_include_dirs}
-o "${swig_generated_file_fullname}"
"${swig_source_file_fullname}"
- DEPENDS "${swig_source_file_fullname}" ${SWIG_MODULE_${name}_EXTRA_DEPS}
+ MAIN_DEPENDENCY "${swig_source_file_fullname}"
+ DEPENDS ${SWIG_MODULE_${name}_EXTRA_DEPS}
COMMENT "Swig source")
set_source_files_properties("${swig_generated_file_fullname}" ${swig_extra_generated_files}
PROPERTIES GENERATED 1)