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

Use LocatePythonModule to locate asn2wrs.py 

This reuses existing functionality and thereby making FindAsn2Wrs.cmake obsolete, resulting in a reduction of the cmake module maintaince load

Change-Id: Ic6ae53e65236246c0cbe86f8c2f066a2d034e0b9
Reviewed-on: https://code.wireshark.org/review/5805
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Maarten Bezemer 2014-12-17 15:03:56 +01:00 committed by Anders Broman
parent cb345eb4bd
commit a73b89bec1
3 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -1794,7 +1794,6 @@ configure_file("${CMAKE_MODULE_PATH}/WiresharkConfig.cmake.in" "${CMAKE_BINARY_D
configure_file("${CMAKE_MODULE_PATH}/WiresharkConfigVersion.cmake.in" "${CMAKE_BINARY_DIR}/WiresharkConfigVersion.cmake" @ONLY)
install(
FILES
${CMAKE_MODULE_PATH}/FindAsn2Wrs.cmake
${CMAKE_MODULE_PATH}/FindGLIB2.cmake
${CMAKE_MODULE_PATH}/FindWireshark.cmake
${CMAKE_MODULE_PATH}/FindWSWinLibs.cmake

16
cmake/modules/FindAsn2Wrs.cmake
View File

@ -1,16 +0,0 @@
#
# Look for the asn2wrs.py utility
#
find_program( ASN2WRS_EXECUTABLE
NAMES
asn2wrs.py
HINTS
# First try to find it in wireshark sources
${CMAKE_SOURCE_DIR}/tools
)
include( FindPackageHandleStandardArgs )
find_package_handle_standard_args( ASN2WRS DEFAULT_MSG ASN2WRS_EXECUTABLE )
mark_as_advanced( ASN2WRS_EXECUTABLE )

11
cmake/modules/UseAsn2Wrs.cmake
View File

@ -1,7 +1,8 @@
# - Convert ASN.1 file into C source and header files that can be used to create a wireshark dissector
MACRO(ASN2WRS)
find_package(Asn2Wrs REQUIRED)
include(LocatePythonModule)
locate_python_module(asn2wrs REQUIRED PATHS ${CMAKE_SOURCE_DIR}/tools)
set( DISSECTOR ${CMAKE_SOURCE_DIR}/epan/dissectors/packet-${PROTOCOL_NAME}.c )
@ -24,7 +25,7 @@ MACRO(ASN2WRS)
ADD_CUSTOM_COMMAND(
OUTPUT packet-${PROTOCOL_NAME}.c
COMMAND ${PYTHON_EXECUTABLE}
${ASN2WRS_EXECUTABLE}
${PY_ASN2WRS}
${A2W_FLAGS}
${PROTO_OPT}
-c ${CMAKE_CURRENT_SOURCE_DIR}/${PROTOCOL_NAME}.cnf
@ -33,7 +34,7 @@ MACRO(ASN2WRS)
${A2W_OUTPUT_DIR}
${EXT_ASN_FILE_LIST} ${ASN_FILE_LIST} ${EXT_ASN_FILE_LIST_LATE}
DEPENDS
${ASN2WRS_EXECUTABLE}
${PY_ASN2WRS}
${SRC_FILES}
${EXTRA_CNF}
)
@ -42,7 +43,7 @@ MACRO(ASN2WRS)
ADD_CUSTOM_COMMAND(
OUTPUT ${_asn2wrs_export_file}
COMMAND ${PYTHON_EXECUTABLE}
${ASN2WRS_EXECUTABLE}
${PY_ASN2WRS}
-E
${A2W_FLAGS}
${PROTO_OPT}
@ -50,7 +51,7 @@ MACRO(ASN2WRS)
-D ${CMAKE_CURRENT_SOURCE_DIR}
${EXT_ASN_FILE_LIST} ${ASN_FILE_LIST} ${EXT_ASN_FILE_LIST_LATE}
DEPENDS
${ASN2WRS_EXECUTABLE}
${PY_ASN2WRS}
${SRC_FILES}
${EXPORT_DEPENDS}
)