diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2018-11-23 20:39:48 +0000 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2018-11-24 13:48:16 +0000 |
commit | 65c13f9b900cec51c4117c848bee045c9cecd35f (patch) | |
tree | 153021770405714b67432ecd1beeea33329c8820 | |
parent | f1cf2646aa44fe0f56019906d0edbc49253ececa (diff) |
Install development headers on all platforms
Install headers to support plugins development on Windows.
Change-Id: I3161bd2f730edf62ab44fee6ce4fedbb9aee0d31
Reviewed-on: https://code.wireshark.org/review/30776
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
-rw-r--r-- | CMakeLists.txt | 11 | ||||
-rw-r--r-- | codecs/CMakeLists.txt | 8 | ||||
-rw-r--r-- | epan/CMakeLists.txt | 8 | ||||
-rw-r--r-- | epan/dfilter/CMakeLists.txt | 8 | ||||
-rw-r--r-- | epan/dissectors/CMakeLists.txt | 8 | ||||
-rw-r--r-- | epan/ftypes/CMakeLists.txt | 8 | ||||
-rw-r--r-- | epan/wmem/CMakeLists.txt | 8 | ||||
-rw-r--r-- | wiretap/CMakeLists.txt | 8 | ||||
-rw-r--r-- | wsutil/CMakeLists.txt | 8 |
9 files changed, 27 insertions, 48 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 400dbea74c..14502e02a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2851,14 +2851,9 @@ set(SHARK_PUBLIC_HEADERS ${CMAKE_BINARY_DIR}/ws_version.h ) -if(NOT WIN32) - install( - FILES - ${SHARK_PUBLIC_HEADERS} - DESTINATION - ${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME} - ) -endif() +install(FILES ${SHARK_PUBLIC_HEADERS} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME} +) # Install icons and other desktop files for Freedesktop.org-compliant desktops. if((BUILD_wireshark AND QT_FOUND) AND NOT (WIN32 OR APPLE)) diff --git a/codecs/CMakeLists.txt b/codecs/CMakeLists.txt index 4e07b3e994..81079695ce 100644 --- a/codecs/CMakeLists.txt +++ b/codecs/CMakeLists.txt @@ -86,11 +86,9 @@ install(TARGETS wscodecs ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -if(NOT WIN32) - install(FILES ${WSCODECS_PUBLIC_HEADERS} - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/codecs" - ) -endif() +install(FILES ${WSCODECS_PUBLIC_HEADERS} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/codecs" +) CHECKAPI( NAME diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 75f5d560fb..4be8b19944 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -397,11 +397,9 @@ install(TARGETS epan ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -if(NOT WIN32) - install(FILES ${LIBWIRESHARK_PUBLIC_HEADERS} - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/epan" - ) -endif() +install(FILES ${LIBWIRESHARK_PUBLIC_HEADERS} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/epan" +) add_executable(exntest EXCLUDE_FROM_ALL exntest.c except.c) target_link_libraries(exntest ${GLIB2_LIBRARIES}) diff --git a/epan/dfilter/CMakeLists.txt b/epan/dfilter/CMakeLists.txt index 0506f06dc8..a0a1809f33 100644 --- a/epan/dfilter/CMakeLists.txt +++ b/epan/dfilter/CMakeLists.txt @@ -65,11 +65,9 @@ set_target_properties(dfilter PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL" ) -if(NOT WIN32) - install(FILES ${DFILTER_PUBLIC_HEADERS} - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/epan/dfilter" - ) -endif() +install(FILES ${DFILTER_PUBLIC_HEADERS} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/epan/dfilter" +) CHECKAPI( NAME diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt index 6fe8356f4e..6a71f84c39 100644 --- a/epan/dissectors/CMakeLists.txt +++ b/epan/dissectors/CMakeLists.txt @@ -1964,11 +1964,9 @@ set_target_properties(dissectors PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL" ) -if(NOT WIN32) - install(FILES ${DISSECTOR_PUBLIC_HEADERS} - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/epan/dissectors" - ) -endif() +install(FILES ${DISSECTOR_PUBLIC_HEADERS} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/epan/dissectors" +) set(CHECKAPI_FILE_LIST "${CMAKE_CURRENT_BINARY_DIR}/files.txt") file(GLOB DISSECTOR_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h") diff --git a/epan/ftypes/CMakeLists.txt b/epan/ftypes/CMakeLists.txt index e78d4def4d..61cbf1ae7a 100644 --- a/epan/ftypes/CMakeLists.txt +++ b/epan/ftypes/CMakeLists.txt @@ -49,11 +49,9 @@ set_target_properties(ftypes PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL" ) -if(NOT WIN32) - install(FILES ${FTYPE_PUBLIC_HEADERS} - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/epan/ftypes" - ) -endif() +install(FILES ${FTYPE_PUBLIC_HEADERS} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/epan/ftypes" +) CHECKAPI( NAME diff --git a/epan/wmem/CMakeLists.txt b/epan/wmem/CMakeLists.txt index 346dbc801d..2ff6d717d5 100644 --- a/epan/wmem/CMakeLists.txt +++ b/epan/wmem/CMakeLists.txt @@ -74,11 +74,9 @@ set_target_properties(wmem_test PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL" ) -if(NOT WIN32) - install(FILES ${WMEM_PUBLIC_HEADERS} - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/epan/wmem" - ) -endif() +install(FILES ${WMEM_PUBLIC_HEADERS} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/epan/wmem" +) CHECKAPI( NAME diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index cbf94aa396..ac4eafee76 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -162,11 +162,9 @@ install(TARGETS wiretap ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -if(NOT WIN32) - install(FILES ${WIRETAP_PUBLIC_HEADERS} - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/wiretap" - ) -endif() +install(FILES ${WIRETAP_PUBLIC_HEADERS} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/wiretap" +) CHECKAPI( NAME diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index 80d8e5d120..971900938f 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -298,11 +298,9 @@ install(TARGETS wsutil ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -if(NOT WIN32) - install(FILES ${WSUTIL_PUBLIC_HEADERS} - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/wsutil" - ) -endif() +install(FILES ${WSUTIL_PUBLIC_HEADERS} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/wsutil" +) CHECKAPI( NAME |