summaryrefslogtreecommitdiff
path: root/wsutil
diff options
context:
space:
mode:
authorBalint Reczey <balint@balintreczey.hu>2013-10-15 07:30:05 +0000
committerBalint Reczey <balint@balintreczey.hu>2013-10-15 07:30:05 +0000
commit8956ee2a567e2e2e4d8b8704d80beb9cde6678b1 (patch)
tree51cf19e31d2856428b0195e4b131435c93c9536a /wsutil
parent66de01339985521b2b69fcfcb4cd0587dea63fba (diff)
downloadwireshark-8956ee2a567e2e2e4d8b8704d80beb9cde6678b1.tar.gz
Factor out common parts of ABI checks to UseABICheck.cmake
svn path=/trunk/; revision=52614
Diffstat (limited to 'wsutil')
-rw-r--r--wsutil/CMakeLists.txt18
1 files changed, 3 insertions, 15 deletions
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index cbc5d0de03..ca9053957c 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -21,6 +21,8 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
+include(UseABICheck)
+
IF(WIN32)
set(WSUTIL_PLATFORM_FILES
file_util.c
@@ -99,20 +101,7 @@ set_target_properties(wsutil PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
set_target_properties(wsutil PROPERTIES VERSION ${FULL_SO_VERSION} SOVERSION 0)
set_target_properties(wsutil PROPERTIES FOLDER "DLLs")
-# discover and substitute list of include directories for ABI compatibility
-# checks
-get_directory_property(INCLUDE_DIRS INCLUDE_DIRECTORIES)
-list(REMOVE_DUPLICATES INCLUDE_DIRS)
-string(REGEX REPLACE ";" "\n" INCLUDE_DIRS "${INCLUDE_DIRS}")
-configure_file(../abi-descriptor.template abi-descriptor.xml)
-
-# ABI compliance checker can be obtained from
-# http://ispras.linux-foundation.org/index.php/ABI_compliance_checker
-# Checked using version 1.21.12
-file(GLOB HEADERS *.h)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/abi-check-headers)
-
-file(COPY ${HEADERS} ../ws_symbol_export.h DESTINATION abi-check-headers)
+ABICHECK(libwsutil)
add_custom_command(OUTPUT libwsutil.abi.tar.gz
COMMAND cp ../config.h abi-check-headers/
@@ -122,7 +111,6 @@ add_custom_command(OUTPUT libwsutil.abi.tar.gz
COMMAND cp abi_dumps/libwsutil/libwsutil_* libwsutil.abi.tar.gz
COMMAND rm -rf abi-check-headers/* abi_dumps
DEPENDS ${HEADERS} wsutil)
-add_custom_target(dumpabi-libwsutil DEPENDS libwsutil.abi.tar.gz)
target_link_libraries(wsutil ${wsutil_LIBS})