From 21d2158a0bf39c08af6c5a24ef9895f819cd3af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Sun, 3 Sep 2017 00:42:00 +0100 Subject: CMake: Initial work to install headers for the benefit of plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To be continued incrementally to fix gaps and omissions. If we are willing to reorganize the source tree to have one or two header include folders this could be simplified considerably. It would also force developers to give more consideration to API issues, which is a good thing. See also e7ef19efc0e928b50644b37772ccbf176e74f766. Bug: 14062 Change-Id: I0759da2f9793cfb5cf92c9e231457bba43df4353 Reviewed-on: https://code.wireshark.org/review/23548 Petri-Dish: João Valverde Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde --- wsutil/CMakeLists.txt | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) (limited to 'wsutil') diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index 45fd307e09..9bf2b6c30b 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -21,6 +21,64 @@ include(UseABICheck) +set(WSUTIL_PUBLIC_HEADERS + adler32.h + base32.h + base64.h + bits_count_ones.h + bits_ctz.h + bitswap.h + buffer.h + clopts_common.h + cmdarg_err.h + color.h + copyright_info.h + cpu_info.h + crash_info.h + crc6.h + crc7.h + crc8.h + crc10.h + crc11.h + crc16.h + crc16-plain.h + crc32.h + eax.h + filesystem.h + frequency-utils.h + g711.h + glib-compat.h + inet_addr.h + inet_ipv6.h + interface.h + jsmn.h + mpeg-audio.h + nstime.h + os_version_info.h + pint.h + plugins.h + privileges.h + processes.h + report_message.h + sign_ext.h + sober128.h + socket.h + str_util.h + strnatcmp.h + strtoi.h + tempfile.h + time_util.h + type_util.h + unicode-utils.h + utf8_entities.h + ws_cpuid.h + ws_mempbrk.h + ws_mempbrk_int.h + ws_printf.h + wsjsmn.h + xtea.h +) + set(WSUTIL_COMMON_FILES adler32.c airpdcap_wep.c @@ -247,6 +305,12 @@ if(NOT ${ENABLE_STATIC}) ) endif() +if(NOT WIN32) + install(FILES ${WSUTIL_PUBLIC_HEADERS} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/wsutil" + ) +endif() + # Export build-time datadir (note: the macro "DATAFILE_DIR" is defined in # config.h and points to the install-time data directory, hence the different # name). -- cgit v1.2.3