diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2019-02-01 16:25:24 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2019-02-02 16:53:49 +0000 |
| commit | c2eddffb84e7b7c9f8c001d74f8e9c845687bcce (patch) | |
| tree | c175d3167d0c6d3a90cd09f71cd4cccd1f869966 /epan | |
| parent | 16e20ccec7e54c57a5c1d0593da9185eaf497640 (diff) | |
CMake: Fix DOCDIR on Unix
User guides are installed to doc/Wireshark. Use doc/wireshark instead.
Remove leftover variable CPACK_PACKAGE_NAME.
Change-Id: I9a1d6bdc7d8f0b48c61e43679285d5ba83904a63
Reviewed-on: https://code.wireshark.org/review/31851
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | epan/dfilter/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | epan/dissectors/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | epan/ftypes/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | epan/wmem/CMakeLists.txt | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 5afdacd966..2135d84153 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -407,7 +407,7 @@ install(TARGETS epan ) install(FILES ${LIBWIRESHARK_PUBLIC_HEADERS} - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/epan" + DESTINATION "${PROJECT_INSTALL_INCLUDEDIR}/epan" ) add_executable(exntest EXCLUDE_FROM_ALL exntest.c except.c) diff --git a/epan/dfilter/CMakeLists.txt b/epan/dfilter/CMakeLists.txt index a0a1809f33..14fcd63a6a 100644 --- a/epan/dfilter/CMakeLists.txt +++ b/epan/dfilter/CMakeLists.txt @@ -66,7 +66,7 @@ set_target_properties(dfilter PROPERTIES ) install(FILES ${DFILTER_PUBLIC_HEADERS} - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/epan/dfilter" + DESTINATION "${PROJECT_INSTALL_INCLUDEDIR}/epan/dfilter" ) CHECKAPI( diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt index 23a9cf07dd..71665036df 100644 --- a/epan/dissectors/CMakeLists.txt +++ b/epan/dissectors/CMakeLists.txt @@ -1975,7 +1975,7 @@ set_target_properties(dissectors PROPERTIES ) install(FILES ${DISSECTOR_PUBLIC_HEADERS} - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/epan/dissectors" + DESTINATION "${PROJECT_INSTALL_INCLUDEDIR}/epan/dissectors" ) set(CHECKAPI_FILE_LIST "${CMAKE_CURRENT_BINARY_DIR}/files.txt") diff --git a/epan/ftypes/CMakeLists.txt b/epan/ftypes/CMakeLists.txt index 61cbf1ae7a..606eccdd97 100644 --- a/epan/ftypes/CMakeLists.txt +++ b/epan/ftypes/CMakeLists.txt @@ -50,7 +50,7 @@ set_target_properties(ftypes PROPERTIES ) install(FILES ${FTYPE_PUBLIC_HEADERS} - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/epan/ftypes" + DESTINATION "${PROJECT_INSTALL_INCLUDEDIR}/epan/ftypes" ) CHECKAPI( diff --git a/epan/wmem/CMakeLists.txt b/epan/wmem/CMakeLists.txt index 2ff6d717d5..98d96424c2 100644 --- a/epan/wmem/CMakeLists.txt +++ b/epan/wmem/CMakeLists.txt @@ -75,7 +75,7 @@ set_target_properties(wmem_test PROPERTIES ) install(FILES ${WMEM_PUBLIC_HEADERS} - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/epan/wmem" + DESTINATION "${PROJECT_INSTALL_INCLUDEDIR}/epan/wmem" ) CHECKAPI( |