forked from osmocom/wireshark
Minor refactoring in CMake ABI dump generation
svn path=/trunk/; revision=52689
This commit is contained in:
parent
70dce86ab3
commit
2ec414c257
|
@ -7,6 +7,9 @@
|
|||
|
||||
MACRO(ABICHECK _libname)
|
||||
set(ABICHECK_TMPDIR ${CMAKE_CURRENT_BINARY_DIR}/abi-check-headers)
|
||||
set(ABICHECK_COMMAND abi-compliance-checker -l ${_libname} -v2 ${FULL_SO_VERSION}
|
||||
-relpath ${CMAKE_CURRENT_BINARY_DIR} -dump-abi abi-descriptor.xml
|
||||
|| cat ${CMAKE_CURRENT_BINARY_DIR}/logs/${_libname}/[0-9]*/log.txt)
|
||||
get_directory_property(INCLUDE_DIRS INCLUDE_DIRECTORIES)
|
||||
list(REMOVE_DUPLICATES INCLUDE_DIRS)
|
||||
string(REGEX REPLACE ";" "\n" INCLUDE_DIRS "${INCLUDE_DIRS}")
|
||||
|
|
|
@ -1640,9 +1640,7 @@ add_custom_command(OUTPUT libwireshark.abi.tar.gz
|
|||
${ABICHECK_TMPDIR}/dissectors/x11-glx-render-enum.h
|
||||
${ABICHECK_TMPDIR}/dissectors/x11-register-info.h
|
||||
${ABICHECK_TMPDIR}/dissectors/packet-idmp.h
|
||||
COMMAND abi-compliance-checker -l libwireshark -v1 ${FULL_SO_VERSION}
|
||||
-relpath ${CMAKE_CURRENT_BINARY_DIR} -dump-abi abi-descriptor.xml
|
||||
|| cat ${CMAKE_CURRENT_BINARY_DIR}/logs/libwireshark/[0-9]*/log.txt
|
||||
COMMAND ${ABICHECK_COMMAND}
|
||||
COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/abi_dumps/libwireshark/libwireshark_* ${CMAKE_CURRENT_BINARY_DIR}/libwireshark.abi.tar.gz
|
||||
COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/abi_dumps ${ABICHECK_TMPDIR}/config.h
|
||||
${ABICHECK_TMPDIR}/epan/* ${ABICHECK_TMPDIR}/crypt/*
|
||||
|
|
|
@ -126,9 +126,7 @@ ABICHECK(libwiretap)
|
|||
|
||||
add_custom_command(OUTPUT libwiretap.abi.tar.gz
|
||||
COMMAND cp ../config.h ${ABICHECK_TMPDIR}/
|
||||
COMMAND abi-compliance-checker -l libwiretap -v1 ${FULL_SO_VERSION}
|
||||
-relpath ${CMAKE_CURRENT_BINARY_DIR} -dump-abi abi-descriptor.xml
|
||||
|| cat ${CMAKE_CURRENT_BINARY_DIR}/logs/libwiretap/[0-9]*/log.txt
|
||||
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
|
||||
DEPENDS ${HEADERS} wiretap)
|
||||
|
|
|
@ -105,9 +105,7 @@ ABICHECK(libwsutil)
|
|||
|
||||
add_custom_command(OUTPUT libwsutil.abi.tar.gz
|
||||
COMMAND cp ../config.h ${ABICHECK_TMPDIR}/
|
||||
COMMAND abi-compliance-checker -l libwsutil -v1 ${FULL_SO_VERSION}
|
||||
-relpath ${CMAKE_CURRENT_BINARY_DIR} -dump-abi abi-descriptor.xml
|
||||
|| cat ${CMAKE_CURRENT_BINARY_DIR}/logs/libwsutil/[0-9]*/log.txt
|
||||
COMMAND ${ABICHECK_COMMAND}
|
||||
COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/abi_dumps/libwsutil/libwsutil_* ${CMAKE_CURRENT_BINARY_DIR}/libwsutil.abi.tar.gz
|
||||
COMMAND rm -rf ${ABICHECK_TMPDIR}/* ${CMAKE_CURRENT_BINARY_DIR}/abi_dumps
|
||||
DEPENDS ${HEADERS} wsutil)
|
||||
|
|
Loading…
Reference in New Issue