diff options
author | AndersBroman <anders.broman@ericsson.com> | 2018-04-05 08:59:12 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2018-04-05 13:31:22 +0000 |
commit | 36dc5781ba0ab2067528f646fe2f9dcf5500b3f5 (patch) | |
tree | 2c1e4886deefa77fb611c83062d2a5927777d908 /packaging/wix/CMakeLists.txt | |
parent | d43210e6844e00877aa964bfe88b6c5d1f4ed3c5 (diff) |
GTK Cmake: Remove the option to build the GTK UI.
Change-Id: If702717b559a727388d83ce82c0fc2967c662ff0
Reviewed-on: https://code.wireshark.org/review/26747
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging/wix/CMakeLists.txt')
-rw-r--r-- | packaging/wix/CMakeLists.txt | 120 |
1 files changed, 0 insertions, 120 deletions
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 |