diff options
| -rw-r--r-- | CMakeLists.txt | 138 | ||||
| -rw-r--r-- | CMakeOptions.txt | 10 | ||||
| -rw-r--r-- | debian/control | 15 | ||||
| -rwxr-xr-x | debian/rules | 1 | ||||
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 120 |
6 files changed, 3 insertions, 309 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 092c4c6eb5..8bc9186a69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -902,18 +902,6 @@ if(ENABLE_AIRPCAP) set(PACKAGELIST ${PACKAGELIST} AIRPCAP) endif() -# Build the GTK-GUI? -if(BUILD_wireshark_gtk) - if(ENABLE_GTK3) - set(PACKAGELIST ${PACKAGELIST} GTK3) - else() - set(PACKAGELIST ${PACKAGELIST} GTK2) - set(GTK2_OPTIONS COMPONENTS gtk) - set(GTK2_FIND_VERSION 2.12) - set(GTK2_DEBUG false) - endif() -endif() - # Build the Qt GUI? if(BUILD_wireshark) if(ENABLE_QT5) @@ -975,12 +963,6 @@ if(ENABLE_KERBEROS) set(PACKAGELIST ${PACKAGELIST} KERBEROS) endif() -# Portable audio (GTK+ only) -if(ENABLE_PORTAUDIO AND BUILD_wireshark_gtk) - set(PACKAGELIST ${PACKAGELIST} PORTAUDIO) -endif() - - # C Asynchronous resolver if(ENABLE_CARES) set(PACKAGELIST ${PACKAGELIST} CARES) @@ -1194,12 +1176,6 @@ if (HAVE_LIBWINSPARKLE) set(HAVE_SOFTWARE_UPDATE 1) endif() -# No matter which version of GTK is present -if(GTK2_FOUND OR GTK3_FOUND) - message(WARNING "The GTK+ UI is deprecated and will be removed in a future release.") - set(GTK_FOUND ON) -endif() - if(HAVE_LIBZLIB) set(HAVE_ZLIB 1) # Always include the "true" zlib includes first. This works around a @@ -1347,10 +1323,6 @@ if(NOT WIN32) add_custom_target(dumpabi DEPENDS dumpabi-libwireshark dumpabi-libwiretap dumpabi-libwsutil) endif() -if(BUILD_wireshark_gtk AND GTK_FOUND) - add_subdirectory( ui/gtk ) -endif() - if(BUILD_wireshark AND QT_FOUND) add_subdirectory( ui/qt ) endif() @@ -1505,7 +1477,6 @@ set( IN_FILES packaging/macosx/Wireshark_package.pmdoc/index.xml.in randpkt_core/doxygen.cfg.in ui/doxygen.cfg.in - ui/gtk/doxygen.cfg.in ui/qt/doxygen.cfg.in wireshark.pc.in writecap/doxygen.cfg.in @@ -1566,7 +1537,6 @@ feature_summary(WHAT ALL) link_directories( ${CMAKE_BINARY_DIR}/ui - ${CMAKE_BINARY_DIR}/ui/gtk ${CMAKE_BINARY_DIR}/ui/qt ${CMAKE_BINARY_DIR}/capchild ${CMAKE_BINARY_DIR}/caputils @@ -2124,7 +2094,7 @@ list(APPEND copy_data_files_depends add_custom_target(copy_data_files ALL DEPENDS ${copy_data_files_depends} ) set_target_properties(copy_data_files PROPERTIES FOLDER "Copy Tasks") -if( (BUILD_wireshark AND QT_FOUND) OR (BUILD_wireshark_gtk AND GTK_FOUND) ) +if(BUILD_wireshark AND QT_FOUND) set(WIRESHARK_SRC capture_info.c capture_opts.c @@ -2370,106 +2340,6 @@ macro(set_extcap_executable_properties _executable) endif() endmacro() -if(BUILD_wireshark_gtk AND GTK_FOUND) - set(wireshark_gtk_LIBS - gtkui - ui - capchild - caputils - ${GTK2_LIBRARIES} - ${GTK3_LIBRARIES} - ${GTHREAD2_LIBRARIES} - wscodecs - ${PORTAUDIO_LIBRARIES} - ${LIBEPAN_LIBS} - ${APPLE_APPLICATION_SERVICES_LIBRARY} - ${APPLE_CORE_SERVICES_LIBRARY} - ${APPLE_SYSTEM_CONFIGURATION_LIBRARY} - ${NL_LIBRARIES} - ${WIN_COMCTL32_LIBRARY} - ) - # wireshark and wireshark-gtk share wireshark_FILES - - add_executable(wireshark-gtk WIN32 ${wireshark_FILES}) - add_dependencies(wireshark-gtk version) - set(PROGLIST ${PROGLIST} wireshark-gtk) - set_target_properties(wireshark-gtk PROPERTIES - LINK_FLAGS "${WS_LINK_FLAGS}" - FOLDER "Executables" - ) - target_link_libraries(wireshark-gtk ${wireshark_gtk_LIBS}) - install(TARGETS wireshark-gtk RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if(WIN32) - add_custom_target(copy_gtk_dlls) - set_target_properties(copy_gtk_dlls PROPERTIES FOLDER "Copy Tasks") - add_custom_command(TARGET copy_gtk_dlls PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory "${_dll_output_dir}" - ) - - if(GTK2_FOUND) - set(_gtk_dll_dir "${GTK2_DLL_DIR}") - set(_gtk_etc_dir "${GTK2_ETC_DIR}") - set(_gtk_dlls "${GTK2_DLLS}") - set(_gtk_etc_dir "${GTK2_ETC_DIR}") - else() - set(_gtk_dll_dir "${GTK3_DLL_DIR}") - set(_gtk_dlls "${GTK3_DLLS}") - set(_gtk_etc_dir "${GTK3_ETC_DIR}") - endif() - - foreach(_dll ${_gtk_dlls}) - add_custom_command(TARGET copy_gtk_dlls PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${_gtk_dll_dir}/${_dll}" "${_dll_output_dir}" - ) - endforeach(_dll) - - # /etc - add_custom_command(TARGET copy_gtk_dlls PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory "${_dll_output_dir}/etc" - ) - add_custom_command(TARGET copy_gtk_dlls PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory - "${_gtk_etc_dir}" "${_dll_output_dir}/etc" - ) - - # XXX - Omitting ${GTK2_LIB_DIR}\loaders copying from Makefile.nmake - if(GTK2_FOUND) - # Engines - set (_engines_output_dir "${_dll_output_dir}/lib/gtk-2.0/2.10.0/engines") - add_custom_command(TARGET copy_gtk_dlls PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory "${_engines_output_dir}" - ) - foreach(_dll ${GTK2_ENGINES_DLLS}) - add_custom_command(TARGET copy_gtk_dlls PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${GTK2_ENGINES_DLL_DIR}/${_dll}" "${_engines_output_dir}" - ) - endforeach(_dll) - - # Themes - add_custom_command(TARGET copy_gtk_dlls PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${GTK2_THEMES_DIR}/gtkrc" "${_dll_output_dir}/etc/gtk-2.0" - ) - - # Modules - add_custom_command(TARGET copy_gtk_dlls PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory - "${GTK2_LIB_DIR}" "${_dll_output_dir}/lib/gtk-2.0" - ) - else() - add_custom_command(TARGET copy_gtk_dlls PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory - "${CMAKE_SOURCE_DIR}/ui/win32/settings.ini" "${_dll_output_dir}/etc" - ) - endif() - - add_dependencies(wireshark-gtk copy_gtk_dlls copy_cli_dlls) - endif(WIN32) -endif() - register_tap_files(tshark-tap-register.c ${TSHARK_TAP_SRC} ) @@ -3165,7 +3035,7 @@ if(NOT WIN32) endif() # Install icons and other desktop files for Freedesktop.org-compliant desktops. -if(((BUILD_wireshark AND QT_FOUND) OR BUILD_wireshark_gtk) AND NOT (WIN32 OR APPLE)) +if((BUILD_wireshark AND QT_FOUND) AND NOT (WIN32 OR APPLE)) install(FILES wireshark-mime-package.xml DESTINATION "${CMAKE_INSTALL_DATADIR}/mime/packages" RENAME wireshark.xml @@ -3177,10 +3047,6 @@ if(((BUILD_wireshark AND QT_FOUND) OR BUILD_wireshark_gtk) AND NOT (WIN32 OR APP install(FILES wireshark.desktop DESTINATION "${CMAKE_INSTALL_DATADIR}/applications") endif() - if(BUILD_wireshark_gtk) - install(FILES wireshark-gtk.desktop - DESTINATION "${CMAKE_INSTALL_DATADIR}/applications") - endif() foreach(size 16 24 32 48 64 128 256) install(FILES image/wsicon${size}.png DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/${size}x${size}/apps" diff --git a/CMakeOptions.txt b/CMakeOptions.txt index fc7064ac9e..7afc408997 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -1,7 +1,6 @@ # Build options for use by CMake option(BUILD_wireshark "Build Wireshark" ON) -option(BUILD_wireshark_gtk "Build Wireshark (GTK+ UI)" OFF) option(BUILD_tshark "Build tshark" ON) option(BUILD_tfshark "Build tfshark" OFF) option(BUILD_rawshark "Build rawshark" ON) @@ -41,14 +40,6 @@ option(ENABLE_UBSAN "Enable UndefinedBehaviorSanitizer (UBSan) for debugging" OF option(ENABLE_CHECKHF_CONFLICT "Enable hf conflict check for debugging (start-up may be slower)" OFF) option(ENABLE_CCACHE "Speed up compiling and linking using ccache if possible" OFF) -# -# Leave GTK2 the default on Windows, looks better than GTK3 -# -if(WIN32) - option(ENABLE_GTK3 "Use GTK3 instead of GTK2 to build wireshark" OFF) -else() - option(ENABLE_GTK3 "Use GTK3 instead of GTK2 to build wireshark" ON) -endif() option(ENABLE_QT5 "Use Qt5 instead of Qt4 to build wireshark" ON) option(ENABLE_PCAP "Enable libpcap support (required for capturing)" ON) # @@ -64,7 +55,6 @@ option(ENABLE_PLUGINS "Build with plugins" ON) option(ENABLE_PLUGIN_IFDEMO "Build with plugin interface demo" OFF) option(ENABLE_PCAP_NG_DEFAULT "Enable pcapng as default file format" ON) -option(ENABLE_PORTAUDIO "Build with PortAudio support" ON) option(ENABLE_ZLIB "Build with zlib compression support" ON) option(ENABLE_LZ4 "Build with LZ4 compression support" ON) option(ENABLE_SNAPPY "Build with Snappy compression support" ON) diff --git a/debian/control b/debian/control index e1b1511cdd..c93ef2404f 100644 --- a/debian/control +++ b/debian/control @@ -49,7 +49,7 @@ Description: network traffic analyzer - common files Package: wireshark Architecture: any -Depends: wireshark-qt | wireshark-gtk, ${misc:Depends} +Depends: wireshark-qt, ${misc:Depends} Replaces: ethereal (<< 1.0.0-3) Conflicts: ethereal (<< 1.0.0-3) Description: network traffic analyzer - meta-package @@ -72,19 +72,6 @@ Description: network traffic analyzer - Qt version . This package provides the Qt version of Wireshark. -Package: wireshark-gtk -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, wireshark-common (= ${binary:Version}) -Recommends: xdg-utils -Replaces: ethereal (<< 1.0.0-3), wireshark (<< 2.0.0~) -Breaks: ethereal (<< 1.0.0-3), wireshark (<< 2.0.0~) -Description: network traffic analyzer - GTK+ version - Wireshark is a network "sniffer" - a tool that captures and analyzes - packets off the wire. Wireshark can decode too many protocols to list - here. - . - This package provides the GTK+ version of Wireshark. - Package: tshark Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, wireshark-common (= ${binary:Version}) diff --git a/debian/rules b/debian/rules index 88ece0c94e..8a9cce2d69 100755 --- a/debian/rules +++ b/debian/rules @@ -28,7 +28,6 @@ export docdir = /usr/share/doc/wireshark-doc override_dh_auto_configure: dh_auto_configure -- -DBUILD_xxx2deb=ON -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \ - -DBUILD_wireshark_gtk=ON \ # -DENABLE_QT5=OFF override_dh_auto_build: diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 4ad9ea973a..66cfaf0a8a 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -13,7 +13,6 @@ set(NSIS_GENERATED_FILES ${CMAKE_CURRENT_BINARY_DIR}/all-manifest.nsh ${CMAKE_CURRENT_BINARY_DIR}/config.nsh - ${CMAKE_CURRENT_BINARY_DIR}/gtk-dll-manifest.nsh ${CMAKE_CURRENT_BINARY_DIR}/qt-dll-manifest.nsh ) set(NSIS_GENERATED_FILES ${NSIS_GENERATED_FILES} PARENT_SCOPE) @@ -75,10 +74,6 @@ if(BUILD_wireshark AND QT_FOUND) set (QT_DIR "\${STAGING_DIR}") endif() -if(BUILD_wireshark_gtk AND GTK_FOUND) - set (GTK_DIR "\${STAGING_DIR}") -endif() - # Look for the Visual C++ Redistributable packages in the following locations: # - _PROJECT_LIB_DIR # - _PROJECT_LIB_DIR/vcredist_MSVCxx @@ -143,28 +138,6 @@ foreach(_script "init.lua" "console.lua" "dtd_gen.lua") endforeach() file(WRITE "${_all_manifest}" "${_all_manifest_contents}") -# gtk-dll-manifest.nsh. Can be created at configure time. -set(_gtk_dll_manifest "${CMAKE_CURRENT_BINARY_DIR}/gtk-dll-manifest.nsh") -set(_gtk_dll_manifest_contents "# Files required for the GTK+ section. Generated by CMake.\n") -if(BUILD_wireshark_gtk AND GTK_FOUND) - foreach(_dll ${GTK2_DLLS} ${GTK3_DLLS}) - set(_gtk_dll_manifest_contents "${_gtk_dll_manifest_contents}File \"\${STAGING_DIR}\\${_dll}\"\n") - endforeach() - set(_gtk_dll_manifest_contents "${_gtk_dll_manifest_contents}# Subdirectories\n") - if(GTK2_ETC_DIR) - set(_gtk_dll_manifest_contents "${_gtk_dll_manifest_contents}SetOutPath \$INSTDIR\\etc\\gtk-2.0\n") - set(_gtk_dll_manifest_contents "${_gtk_dll_manifest_contents}File \"\${STAGING_DIR}\\etc\\gtk-2.0\\*.*\"\n") - endif() - if(GTK2_ENGINES_DLL_DIR) - set(_gtk_dll_manifest_contents "${_gtk_dll_manifest_contents}SetOutPath \$INSTDIR\\lib\\gtk-2.0\\2.10.0\\engines\n") - set(_gtk_dll_manifest_contents "${_gtk_dll_manifest_contents}File \"\${STAGING_DIR}\\lib\\gtk-2.0\\2.10.0\\engines\\*.*\"\n") - endif() - set(_gtk_dll_manifest_contents "${_gtk_dll_manifest_contents}SetOutPath \$INSTDIR\\lib\\gtk-2.0\\modules\n") - set(_gtk_dll_manifest_contents "${_gtk_dll_manifest_contents}File \"\${STAGING_DIR}\\lib\\gtk-2.0\\modules\\*.*\"\n") - # XXX Schemas (GTK3) -endif() -file(WRITE "${_gtk_dll_manifest}" "${_gtk_dll_manifest_contents}") - file(TO_NATIVE_PATH "${DATAFILE_DIR}" _staging_dir) file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" _outfile_dir) file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" _nsis_include_dir) @@ -232,7 +205,6 @@ endmacro( ADD_NSIS_PACKAGE_TARGET ) set(CLEAN_FILES all-manifest.nsh config.nsh - gtk-dll-manifest.nsh #NEWS.txt qt-dll-manifest.nsh #user-guide.chm diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index 863096c4df..bb826e5cf2 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -12,7 +12,6 @@ set(WIX_GENERATED_FILES ${CMAKE_CURRENT_BINARY_DIR}/DependentComponents.wxs ${CMAKE_CURRENT_BINARY_DIR}/Diameter.wxs - ${CMAKE_CURRENT_BINARY_DIR}/GtkDependentComponents.wxs ${CMAKE_CURRENT_BINARY_DIR}/QtDependentComponents.wxs ${CMAKE_CURRENT_BINARY_DIR}/QtTranslation.wxs ${CMAKE_CURRENT_BINARY_DIR}/RadiusDict.wxs @@ -44,7 +43,6 @@ set(WIX_FILES set(WIX_OUT_FILES ${CMAKE_CURRENT_BINARY_DIR}/DependentComponents.wixobj ${CMAKE_CURRENT_BINARY_DIR}/Diameter.wixobj - ${CMAKE_CURRENT_BINARY_DIR}/GtkDependentComponents.wixobj ${CMAKE_CURRENT_BINARY_DIR}/QtDependentComponents.wixobj ${CMAKE_CURRENT_BINARY_DIR}/QtTranslation.wixobj ${CMAKE_CURRENT_BINARY_DIR}/RadiusDict.wixobj @@ -174,122 +172,6 @@ file(APPEND "${_all_manifest_wix}" " </ComponentGroup>\n") file(APPEND "${_all_manifest_wix}" " </Fragment>\n") file(APPEND "${_all_manifest_wix}" "\n</Wix>\n") -# GtkDependentComponents.wxs. Can be created at configure time. -set(_gtk_dll_manifest_wix "${CMAKE_CURRENT_BINARY_DIR}/GtkDependentComponents.wxs") -file(WRITE "${_gtk_dll_manifest_wix}" "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n") -file(APPEND "${_gtk_dll_manifest_wix}" "<Wix xmlns=\"http://schemas.microsoft.com/wix/2006/wi\">\n\n") -if(BUILD_wireshark_gtk AND GTK_FOUND) - file(APPEND "${_gtk_dll_manifest_wix}" " <!-- Files required for the GTK+ section. Generated by CMake. -->\n") - file(APPEND "${_gtk_dll_manifest_wix}" "<?include InputPaths.wxi ?>\n") - file(APPEND "${_gtk_dll_manifest_wix}" " <Fragment>\n") - file(APPEND "${_gtk_dll_manifest_wix}" " <DirectoryRef Id=\"INSTALLFOLDER\">\n") - foreach(_dll ${GTK2_DLLS} ${GTK3_DLLS}) - IF(NOT "${unique_component}" MATCHES "(^|;)${_dll}(;|$)") - STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_dll}) - file(APPEND "${_gtk_dll_manifest_wix}" " <Component Id=\"cmp${_wix_name}\" Guid=\"*\">\n") - file(APPEND "${_gtk_dll_manifest_wix}" " <File Id=\"fil${_wix_name}\" KeyPath=\"yes\" Source=\"$(var.Staging.Dir)\\${_dll}\"/>\n") - file(APPEND "${_gtk_dll_manifest_wix}" " </Component>\n") - SET(unique_component ${unique_component} ${_dll}) - ENDIF(NOT "${unique_component}" MATCHES "(^|;)${_dll}(;|$)") - endforeach() - file(APPEND "${_gtk_dll_manifest_wix}" " </DirectoryRef>\n") - file(APPEND "${_gtk_dll_manifest_wix}" " </Fragment>\n") - file(APPEND "${_gtk_dll_manifest_wix}" " <Fragment>\n") - file(APPEND "${_gtk_dll_manifest_wix}" " <ComponentGroup Id=\"CG.GTKRequiredDependencies\">\n") - foreach(_dll ${GTK2_DLLS} ${GTK3_DLLS}) - IF(NOT "${unique_file}" MATCHES "(^|;)${_dll}(;|$)") - STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_dll}) - file(APPEND "${_gtk_dll_manifest_wix}" " <ComponentRef Id=\"cmp${_wix_name}\" />\n") - SET(unique_file ${unique_file} ${_dll}) - ENDIF(NOT "${unique_file}" MATCHES "(^|;)${_dll}(;|$)") - endforeach() - file(APPEND "${_gtk_dll_manifest_wix}" " </ComponentGroup>\n") - file(APPEND "${_gtk_dll_manifest_wix}" " </Fragment>\n") - - #XXX - May be able to do this with heat.exe, but attaching it to existing GTK dependencies for now - if(GTK2_ETC_DIR) - file(APPEND "${_gtk_dll_manifest_wix}" " <Fragment>\n") - file(APPEND "${_gtk_dll_manifest_wix}" " <DirectoryRef Id=\"dirEtcGtk2_0\">\n") - file(GLOB gtk2_etc "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/etc/gtk-2.0/*") - foreach(_file ${gtk2_etc}) - get_filename_component(_gtk_dll ${_file} NAME_WE) - get_filename_component(_gtk_dll_ext ${_file} EXT) - set(_gtk_dll ${_gtk_dll}${_gtk_dll_ext}) - STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_gtk_dll}) - file(APPEND "${_gtk_dll_manifest_wix}" " <Component Id=\"cmp${_wix_name}\" Guid=\"*\">\n") - file(APPEND "${_gtk_dll_manifest_wix}" " <File Id=\"fil${_wix_name}\" KeyPath=\"yes\" Source=\"$(var.GTK2_0.Dir)\\${_gtk_dll}\" />\n") - file(APPEND "${_gtk_dll_manifest_wix}" " </Component>\n") - endforeach() - file(APPEND "${_gtk_dll_manifest_wix}" " </DirectoryRef>\n") - file(APPEND "${_gtk_dll_manifest_wix}" " </Fragment>\n") - endif() - if(GTK2_ENGINES_DLL_DIR) - file(APPEND "${_gtk_dll_manifest_wix}" " <Fragment>\n") - file(APPEND "${_gtk_dll_manifest_wix}" " <DirectoryRef Id=\"dirLibGtk2_0_2_10_0_engines\">\n") - file(GLOB gtk2_engines "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/lib/gtk-2.0/2.10.0/engines/*") - foreach(_file ${gtk2_engines}) - get_filename_component(_gtk_dll ${_file} NAME_WE) - get_filename_component(_gtk_dll_ext ${_file} EXT) - set(_gtk_dll ${_gtk_dll}${_gtk_dll_ext}) - STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_gtk_dll}) - file(APPEND "${_gtk_dll_manifest_wix}" " <Component Id=\"cmp${_wix_name}\" Guid=\"*\">\n") - file(APPEND "${_gtk_dll_manifest_wix}" " <File Id=\"fil${_wix_name}\" KeyPath=\"yes\" Source=\"$(var.Lib_GTK2_0_Engines.Dir)\\${_gtk_dll}\" />\n") - file(APPEND "${_gtk_dll_manifest_wix}" " </Component>\n") - endforeach() - file(APPEND "${_gtk_dll_manifest_wix}" " </DirectoryRef>\n") - file(APPEND "${_gtk_dll_manifest_wix}" " </Fragment>\n") - endif() - file(APPEND "${_gtk_dll_manifest_wix}" " <Fragment>\n") - file(APPEND "${_gtk_dll_manifest_wix}" " <DirectoryRef Id=\"dirLibGtk2_0_modules\">\n") - file(GLOB gtk2_modules "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/lib/gtk-2.0/modules/*") - foreach(_file ${gtk2_modules}) - get_filename_component(_gtk_dll ${_file} NAME_WE) - get_filename_component(_gtk_dll_ext ${_file} EXT) - set(_gtk_dll ${_gtk_dll}${_gtk_dll_ext}) - STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_gtk_dll}) - file(APPEND "${_gtk_dll_manifest_wix}" " <Component Id=\"cmp${_wix_name}\" Guid=\"*\">\n") - file(APPEND "${_gtk_dll_manifest_wix}" " <File Id=\"fil${_wix_name}\" KeyPath=\"yes\" Source=\"$(var.Lib_GTK2_0_Modules.Dir)\\${_gtk_dll}\" />\n") - file(APPEND "${_gtk_dll_manifest_wix}" " </Component>\n") - endforeach() - file(APPEND "${_gtk_dll_manifest_wix}" " </DirectoryRef>\n") - file(APPEND "${_gtk_dll_manifest_wix}" " </Fragment>\n") - #put the files into a group - file(APPEND "${_gtk_dll_manifest_wix}" " <Fragment>\n") - file(APPEND "${_gtk_dll_manifest_wix}" " <ComponentGroup Id=\"CG.GTKSubdirectory\">\n") - if(GTK2_ETC_DIR) - foreach(_file ${gtk2_etc}) - get_filename_component(_gtk_dll ${_file} NAME_WE) - get_filename_component(_gtk_dll_ext ${_file} EXT) - set(_gtk_dll ${_gtk_dll}${_gtk_dll_ext}) - STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_gtk_dll}) - file(APPEND "${_gtk_dll_manifest_wix}" " <ComponentRef Id=\"cmp${_wix_name}\" />\n") - endforeach() - endif() - if(GTK2_ENGINES_DLL_DIR) - foreach(_file ${gtk2_engines}) - get_filename_component(_gtk_dll ${_file} NAME_WE) - get_filename_component(_gtk_dll_ext ${_file} EXT) - set(_gtk_dll ${_gtk_dll}${_gtk_dll_ext}) - STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_gtk_dll}) - file(APPEND "${_gtk_dll_manifest_wix}" " <ComponentRef Id=\"cmp${_wix_name}\" />\n") - endforeach() - endif() - foreach(_file ${gtk2_modules}) - get_filename_component(_gtk_dll ${_file} NAME_WE) - get_filename_component(_gtk_dll_ext ${_file} EXT) - set(_gtk_dll ${_gtk_dll}${_gtk_dll_ext}) - STRING(REGEX REPLACE "[-|\\.]" "_" _wix_name ${_gtk_dll}) - file(APPEND "${_gtk_dll_manifest_wix}" " <ComponentRef Id=\"cmp${_wix_name}\" />\n") - endforeach() - file(APPEND "${_gtk_dll_manifest_wix}" " </ComponentGroup>\n") - file(APPEND "${_gtk_dll_manifest_wix}" " </Fragment>\n") - -endif() -file(APPEND "${_gtk_dll_manifest_wix}" "\n</Wix>\n") - -if(BUILD_wireshark_gtk AND GTK_FOUND) - set(d_gtk_dir "-dGTK_DIR") -endif() if(SMI_DIR) set(d_smi_dir "-dSMI_DIR") @@ -315,7 +197,6 @@ set(WIX_CANDLE_DEFINES -dSnmpMibDir=${ARCHIVE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/snmp/mibs -dVCRedistVersion=${MSVC_CRT_VERSION} -dVCRedistDir=${MERGE_MODULE_DIR} - ${d_gtk_dir} ${d_smi_dir} ${d_mmdbresolve_exe} -arch ${TARGET_MACHINE} @@ -408,7 +289,6 @@ endmacro( ADD_WIX_PACKAGE_TARGET ) set(CLEAN_FILES DependentComponents.wxs - GtkDependentComponents.wxs QtDependentComponents.wxs SNMPMibs.wxs RadiusDict.wxs |