aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2017-06-19 10:37:29 -0400
committerAnders Broman <a.broman58@gmail.com>2017-08-19 15:59:04 +0000
commit0831becc1a650399b5cc417f65f5649a9cd76270 (patch)
treef56d1c17f88e923c6d908ad3ab6ccb9b80edf55c /CMakeLists.txt
parent7981d4bf0edc69ceea28914ae78899b0ef3850be (diff)
Remove support for CPack.
It's very incomplete and we already have installation makers for supported OSes. Change-Id: Ide6332b9b6d69b66e7262662d781b548526ab752 Reviewed-on: https://code.wireshark.org/review/22226 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt30
1 files changed, 28 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82c77d3c24..986ebe587b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1076,8 +1076,34 @@ endforeach()
# Provide Windows system lib names
include( UseWinLibs )
-#packaging
-include(CPackConfig.txt)
+#packaging information
+# XXX The CMake documentation recommends setting CPACK_PROJECT_CONFIG_FILE
+# instead.
+if(WIN32)
+ # To do:
+ # - Add WinPCap
+ # - Add USBPcap
+ # - Add CLI DLLs
+ # - Add common (Glib, etc) DLLs
+ # - Add Qt DLLs
+ # - Add
+ set(CPACK_PACKAGE_NAME Wireshark)
+else()
+ set(CPACK_PACKAGE_NAME wireshark)
+endif()
+
+set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
+
+# dist target that prepares source dir
+add_custom_target(dist
+ COMMAND "${CMAKE_COMMAND}"
+ -DPROJECT_SOURCE_DIR="${PROJECT_SOURCE_DIR}"
+ -DGIT_EXECUTABLE="${GIT_EXECUTABLE}"
+ -DWS_SOURCE_DIR="${WS_SOURCE_DIR}"
+ -P "${CMAKE_SOURCE_DIR}/cmake/modules/Dist.cmake"
+ COMMAND "${CMAKE_MAKE_PROGRAM}" package_source
+)
+
if(HAVE_LIBAIRPCAP)
set(HAVE_AIRPCAP 1)