diff options
author | Jörg Mayer <jmayer@loplof.de> | 2013-05-07 03:25:49 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2013-05-07 03:25:49 +0000 |
commit | 5ba458916a954261753794afba073fc0ed6243ce (patch) | |
tree | b6dd791cbcafe0bef7a5500071a00e7507da9c87 /asn1/HI2Operations | |
parent | 1b6e8300a69710ea10f02338d6007c1fe4a3d1fd (diff) |
Move common code into UseAsn2Wrs.cmake.
Include the new file.
Use the new file.
Add cmake support to rebuild the gsm_map dissector.
svn path=/trunk/; revision=49194
Diffstat (limited to 'asn1/HI2Operations')
-rw-r--r-- | asn1/HI2Operations/CMakeLists.txt | 56 |
1 files changed, 13 insertions, 43 deletions
diff --git a/asn1/HI2Operations/CMakeLists.txt b/asn1/HI2Operations/CMakeLists.txt index aa3c34fe96..5ba086c840 100644 --- a/asn1/HI2Operations/CMakeLists.txt +++ b/asn1/HI2Operations/CMakeLists.txt @@ -25,15 +25,21 @@ set( PROTOCOL_NAME HI2Operations ) set( ASN_FILE_LIST HI2Operations_ver11.asn - UmtsHI2Operations.asn - TS101909201.asn - PCESP.asn - EN301040.asn + UmtsHI2Operations.asn + TS101909201.asn + PCESP.asn + EN301040.asn +) + +set( EXTRA_DIST + ${ASN_FILE_LIST} + packet-${PROTOCOL_NAME}-template.c + ${PROTOCOL_NAME}.cnf ) set( SRC_FILES - ${EXTRA_DIST} - ${EXT_ASN_FILE_LIST} + ${EXTRA_DIST} + ${EXT_ASN_FILE_LIST} ) set( A2W_FLAGS -b ) @@ -41,41 +47,5 @@ set( A2W_FLAGS -b ) set( EXTRA_CNF ) -set( DISSECTOR ${CMAKE_SOURCE_DIR}/epan/dissectors/packet-${PROTOCOL_NAME}.c ) - -if ( NOT PROTO_OPT ) - set( PROTO_OPT -p ${PROTOCOL_NAME} ) -endif() - -# Don't use packet-${PROTOCOL_NAME}.c instead of generate_dissector, it will -# cause EXCLUDE_FROM_ALL to be ignored. -ADD_CUSTOM_TARGET(generate_dissector ALL - COMMAND ${PYTHON_EXECUTABLE} - ${CMAKE_SOURCE_DIR}/tools/asn2wrs.py - ${A2W_FLAGS} - ${PROTO_OPT} - -c ${CMAKE_CURRENT_SOURCE_DIR}/${PROTOCOL_NAME}.cnf - -s ${CMAKE_CURRENT_SOURCE_DIR}/packet-${PROTOCOL_NAME}-template - -D ${CMAKE_CURRENT_SOURCE_DIR} - -O ${CMAKE_SOURCE_DIR}/epan/dissectors - ${EXT_ASN_FILE_LIST} ${ASN_FILE_LIST} ${EXT_ASN_FILE_LIST_LATE} - DEPENDS - ${CMAKE_SOURCE_DIR}/tools/asn2wrs.py - ${SRC_FILES} - ${EXTRA_CNF} -) - -ADD_CUSTOM_TARGET(generate_export ALL - COMMAND ${PYTHON_EXECUTABLE} - ${CMAKE_SOURCE_DIR}/tools/asn2wrs.py - -E - ${A2W_FLAGS} - ${PROTO_OPT} - -c ${CMAKE_CURRENT_SOURCE_DIR}/${PROTOCOL_NAME}.cnf - -D ${CMAKE_CURRENT_SOURCE_DIR} - ${EXT_ASN_FILE_LIST} ${ASN_FILE_LIST} ${EXT_ASN_FILE_LIST_LATE} - DEPENDS - ${CMAKE_SOURCE_DIR}/tools/asn2wrs.py - ${SRC_FILES} -) +ASN2WRS() |