osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Revert commits 

------------------------------------------------------------------------
r47064 | cmaynard | 2013-01-14 16:39:38 +0100 (Mo, 14 Jan 2013) | 2 lines

packet-ncp2222.c -> dissectors/packet-ncp2222.c

------------------------------------------------------------------------
r47078 | gerald | 2013-01-14 21:05:24 +0100 (Mo, 14 Jan 2013) | 2 lines

Put packet-ncp2222.c in epan/dissectors. This matches Makefile.am's behavior.

------------------------------------------------------------------------

The first commit tried to make cmake behavior mimic autofoo behavior while
it should be the other way round: out of tree builds fail with packet-ncp2222.c
generation with autofoo.

The second commit just fixed the first one.


svn path=/trunk/; revision=49008
This commit is contained in:
Jörg Mayer 2013-04-23 23:09:34 +00:00
parent 8faa262e90
commit 28adc0dee1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/CMakeLists.txt
View File

@ -128,10 +128,10 @@ else()
endif()
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_SOURCE_DIR}/epan/dissectors/packet-ncp2222.c
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/packet-ncp2222.c
COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_SOURCE_DIR}/tools/ncp2222.py
-o ${CMAKE_SOURCE_DIR}/epan/dissectors/packet-ncp2222.c
-o ${CMAKE_CURRENT_BINARY_DIR}/packet-ncp2222.c
DEPENDS
dissectors/packet-ncp2222.inc
${CMAKE_SOURCE_DIR}/tools/ncp2222.py
@ -933,7 +933,7 @@ set(DISSECTOR_SRC
dissectors/packet-ncp-nmas.c
dissectors/packet-ncp-sss.c
dissectors/packet-ncp.c
dissectors/packet-ncp2222.c
packet-ncp2222.c
dissectors/packet-ncs.c
dissectors/packet-ndmp.c
dissectors/packet-ndp.c