aboutsummaryrefslogtreecommitdiffstats
path: root/cmake/modules
diff options
context:
space:
mode:
authorJoerg Mayer <jmayer@loplof.de>2015-06-25 09:37:28 +0200
committerJörg Mayer <jmayer@loplof.de>2015-06-25 07:40:05 +0000
commit0a28aa4a1da3db6dd7b4dbcfe36d21a3fd720fd8 (patch)
tree002161b3ba1c4ed7c04098973760a5cfa2e31d82 /cmake/modules
parentba5e0a32627041753467709390b761537cb53803 (diff)
Revert commit cc8ed845ed53ed60fa776728f1d7f2659dd311a3
Author: Maarten Bezemer <maarten.bezemer@gmail.com> Date: Wed Nov 12 13:39:07 2014 +0100 Invoke asn2wrs.py using a custom command Fixes bugid 11304 Once there is a better solution feel free to revert the revert. Change-Id: Id64b621c5f3b8a934ce9ec5c3c127326efab46f2 Reviewed-on: https://code.wireshark.org/review/9122 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'cmake/modules')
-rw-r--r--cmake/modules/UseAsn2Wrs.cmake7
1 files changed, 3 insertions, 4 deletions
diff --git a/cmake/modules/UseAsn2Wrs.cmake b/cmake/modules/UseAsn2Wrs.cmake
index 14821bb81c..537398b9c6 100644
--- a/cmake/modules/UseAsn2Wrs.cmake
+++ b/cmake/modules/UseAsn2Wrs.cmake
@@ -22,8 +22,7 @@ MACRO(ASN2WRS)
# Don't use packet-${PROTOCOL_NAME}.c instead of generate_dissector, it will
# cause EXCLUDE_FROM_ALL to be ignored.
- ADD_CUSTOM_COMMAND(
- OUTPUT packet-${PROTOCOL_NAME}.c
+ ADD_CUSTOM_TARGET(generate_dissector-${PROTOCOL_NAME} ALL
COMMAND ${PYTHON_EXECUTABLE}
${PY_ASN2WRS}
${A2W_FLAGS}
@@ -40,8 +39,8 @@ MACRO(ASN2WRS)
)
foreach( _asn2wrs_export_file IN LISTS EXPORT_FILES )
- ADD_CUSTOM_COMMAND(
- OUTPUT ${_asn2wrs_export_file}
+ ADD_CUSTOM_TARGET( ${_asn2wrs_export_file}
+ WORKING_DIRECTORY .
COMMAND ${PYTHON_EXECUTABLE}
${PY_ASN2WRS}
-E