diff options
author | Jörg Mayer <jmayer@loplof.de> | 2013-12-01 22:24:59 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2013-12-01 22:24:59 +0000 |
commit | 70f4223c2ae42f5695e6aa5ec5880cd38bfed30f (patch) | |
tree | 2fcdda92114e7a01633fa7aa183abdfcb74dfd7b /cmake | |
parent | 40c6d9abcbe3c68a01a6e4e41d9f9ebede7d4fee (diff) | |
download | wireshark-70f4223c2ae42f5695e6aa5ec5880cd38bfed30f.tar.gz wireshark-70f4223c2ae42f5695e6aa5ec5880cd38bfed30f.tar.bz2 wireshark-70f4223c2ae42f5695e6aa5ec5880cd38bfed30f.zip |
The changes to work around the msbuild deficiencies broke
dependeny tracking (replaced the list of dissectors by the file
containing the dissectors). Fix that.
svn path=/trunk/; revision=53703
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/modules/UseMakeDissectorReg.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmake/modules/UseMakeDissectorReg.cmake b/cmake/modules/UseMakeDissectorReg.cmake index ab6df9a0ff..c39825c3a0 100644 --- a/cmake/modules/UseMakeDissectorReg.cmake +++ b/cmake/modules/UseMakeDissectorReg.cmake @@ -5,14 +5,16 @@ MACRO(REGISTER_DISSECTOR_FILES _outputfile _registertype ) if(${_registertype} STREQUAL "dissectors" ) set( _makeregistertype "dissectorsinfile" ) set( _ftmp "${CMAKE_CURRENT_BINARY_DIR}/_regc.tmp" ) + set( _depends ${ARGN} ) file(REMOVE ${_ftmp}) - foreach(f ${ARGN}) + foreach(f ${_depends}) file(APPEND ${_ftmp} "${f}\n") endforeach() set( _sources ${_ftmp} ) else() set( _makeregistertype ${_registertype} ) set( _sources ${ARGN} ) + set( _depends ${_sources} ) endif() ADD_CUSTOM_COMMAND( OUTPUT @@ -23,7 +25,7 @@ MACRO(REGISTER_DISSECTOR_FILES _outputfile _registertype ) ${_makeregistertype} ${_sources} DEPENDS - ${_sources} + ${_depends} ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg ${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py ) |