Minor refactoring in CMake ABI dump generation

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52689 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/cmake/modules/UseABICheck.cmake b/cmake/modules/UseABICheck.cmake
index 5ec5462ec37254739c00d4a1831dbdd4b531781f..061bc77bb772e9beb3761c1f560e595d5fef3a24 100644 (file)
--- a/cmake/modules/UseABICheck.cmake
+++ b/cmake/modules/UseABICheck.cmake
@@ -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}")

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index e3fc355df3454343991c6e1b7068067b364d83a6..9454ffcaa98c2a239f854c791bc5e0e176ea2081 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -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/*

diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 47ec7e4ec3828a17046e853ae5184714a496d678..607567de4e649f5f427fe499c52e4b451d005710 100644 (file)
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -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)

diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index f7677e8e85e1fb9b15585ce93c6361676266bc94..02d15a0f04014f7df4137216b861cb78e4600f5f 100644 (file)
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -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)