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/nsis | |
| 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/nsis')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 28 |
1 files changed, 0 insertions, 28 deletions
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 |