diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2013-10-19 15:51:36 +0000 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2013-10-19 15:51:36 +0000 |
| commit | 2ec414c2576301920a4b45ccef711e489a747722 (patch) | |
| tree | 25e288ebc62af23a8a27ca4bdb0dac226af5fd9e | |
| parent | 70dce86ab34c3170a17609f4aeb92fc1bf9b5e31 (diff) | |
Minor refactoring in CMake ABI dump generation
svn path=/trunk/; revision=52689
| -rw-r--r-- | cmake/modules/UseABICheck.cmake | 3 | ||||
| -rw-r--r-- | epan/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | wiretap/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | wsutil/CMakeLists.txt | 4 |
4 files changed, 6 insertions, 9 deletions
diff --git a/cmake/modules/UseABICheck.cmake b/cmake/modules/UseABICheck.cmake index 5ec5462ec3..061bc77bb7 100644 --- 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 e3fc355df3..9454ffcaa9 100644 --- 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 47ec7e4ec3..607567de4e 100644 --- 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 f7677e8e85..02d15a0f04 100644 --- 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) |