diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2015-11-24 23:18:44 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-11-26 12:37:21 +0000 |
| commit | a198f47c06723fabef174cb3983b26ead24f5bc9 (patch) | |
| tree | 8fec7948b5f82c067a8f23bb54c138e493410cee /asn1/x509ce | |
| parent | edb33883032ed8af3ca33df4250d7a12f2f48b53 (diff) | |
cmake: add asn1 target, avoid unnecessary rebuilds
Add an "asn1" build target that rebuilds all ASN.1 dissectors.
Do not always generate the ASN.1 dissector when invoking the
"generate_dissector-PROTO" target. Use a special "packet-PROTO-stamp"
file to detect whether the dissector is out of date.
This indirection is needed because cmake removes output files from
add_custom_command in the clean target, but we would like to keep the
generated packet-PROTO.c files.
Make all EXTRA_CNF and EXPORT_DEPENDS point to absolute paths for
generated exported configs (PROTO-exp.cnf). This is done by automake too
and is needed for proper dependency tracking. Example: when h225.cnf is
updated, h225-exp.cnf needs to be generated. That is the purpose of the
"generate-h225-exp.cnf" target. Now h235 (and other) dissectors need to
be regenerated as well because the h225-exp.cnf is updated. This is why
there is a separate add_custom_command and add_custom_target.
Change-Id: I8cfc1f8f43cea595267b21eae30b4548f3407c0b
Reviewed-on: https://code.wireshark.org/review/12080
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'asn1/x509ce')
| -rw-r--r-- | asn1/x509ce/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asn1/x509ce/CMakeLists.txt b/asn1/x509ce/CMakeLists.txt index 0ea5241749..dc04f53c2c 100644 --- a/asn1/x509ce/CMakeLists.txt +++ b/asn1/x509ce/CMakeLists.txt @@ -50,14 +50,14 @@ set( SRC_FILES set( A2W_FLAGS -b ) set( EXTRA_CNF - p1-exp.cnf - x509af-exp.cnf - x509if-exp.cnf - x509sat-exp.cnf + "${CMAKE_CURRENT_BINARY_DIR}/../p1/p1-exp.cnf" + "${CMAKE_CURRENT_BINARY_DIR}/../x509af/x509af-exp.cnf" + "${CMAKE_CURRENT_BINARY_DIR}/../x509if/x509if-exp.cnf" + "${CMAKE_CURRENT_BINARY_DIR}/../x509sat/x509sat-exp.cnf" ) set( EXPORT_DEPENDS - x509af-exp.cnf + "${CMAKE_CURRENT_BINARY_DIR}/../x509af/x509af-exp.cnf" ) ASN2WRS() |