aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-08-15 17:05:17 -0700
committerGerald Combs <gerald@wireshark.org>2015-08-16 16:04:47 +0000
commitc643cbfb8184a9d2faa888e7210185dab265c5c9 (patch)
tree507e77efd5ecee9352f5a4736cbabbc8fd6f14bb /wiretap
parent8d1a5498fb4c461aff048265178f1edc0d49f250 (diff)
Run abicheck commands at compile time.
The CMake dumpbabi targets collectively copy over 800 files. Do that when when we build the actual targets instead of at configure time. Hopefully this will speed up initial CMake runs. Change-Id: I6e4d691e24c73ea05d638a0f897f570541c84e38 Reviewed-on: https://code.wireshark.org/review/10052 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/CMakeLists.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index cc7f5c2026..458bd70c7f 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -131,10 +131,13 @@ endif()
ABICHECK(libwiretap)
add_custom_command(OUTPUT libwiretap.abi.tar.gz
- COMMAND cp ../config.h ${ABICHECK_TMPDIR}/
+ COMMAND ${CMAKE_COMMAND} -E remove_directory ${ABICHECK_TMPDIR}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${ABICHECK_TMPDIR}
+ COMMAND ${ABI_COPY_COMMAND} ../config.h ${ABICHECK_TMPDIR}/ ${ABI_COPY_FLAGS}
+ COMMAND ${ABI_COPY_COMMAND} ${ABICHECK_HEADERS} ${ABICHECK_TMPDIR}/ ${ABI_COPY_FLAGS}
COMMAND ${ABICHECK_COMMAND}
COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/abi_dumps/libwiretap/libwiretap_* ${CMAKE_CURRENT_BINARY_DIR}/libwiretap.abi.tar.gz
- COMMAND rm -rf ${ABICHECK_TMPDIR}/* ${CMAKE_CURRENT_BINARY_DIR}/abi_dumps
+ COMMAND rm -rf ${ABICHECK_TMPDIR} ${CMAKE_CURRENT_BINARY_DIR}/abi_dumps
DEPENDS ${HEADERS} wiretap)
target_link_libraries(wiretap ${wiretap_LIBS})