From a73b89bec1f5a33e45b2a47c66f3200059d56db8 Mon Sep 17 00:00:00 2001 From: Maarten Bezemer Date: Wed, 17 Dec 2014 15:03:56 +0100 Subject: 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 Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- cmake/modules/FindAsn2Wrs.cmake | 16 ---------------- cmake/modules/UseAsn2Wrs.cmake | 11 ++++++----- 2 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 cmake/modules/FindAsn2Wrs.cmake (limited to 'cmake') diff --git a/cmake/modules/FindAsn2Wrs.cmake b/cmake/modules/FindAsn2Wrs.cmake deleted file mode 100644 index a618649f25..0000000000 --- a/cmake/modules/FindAsn2Wrs.cmake +++ /dev/null @@ -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 ) diff --git a/cmake/modules/UseAsn2Wrs.cmake b/cmake/modules/UseAsn2Wrs.cmake index f8c317e565..14821bb81c 100644 --- a/cmake/modules/UseAsn2Wrs.cmake +++ b/cmake/modules/UseAsn2Wrs.cmake @@ -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} ) -- cgit v1.2.3