osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Jörg Mayer 2013-12-01 22:24:59 +00:00
parent 40c6d9abcb
commit 70f4223c2a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/modules/UseMakeDissectorReg.cmake
View File

@ -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
)