diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-04-04 02:25:01 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-04-09 23:40:51 +0000 |
| commit | ed6eecd79e7b933bccc442589ed3689a646c1256 (patch) | |
| tree | 3bc759a68ea34eb322c4e78679f9a72f84f7fc91 /CMakeLists.txt | |
| parent | 320726b83e2096d9431f28208437a738b31d8ad9 (diff) | |
| download | wireshark-ed6eecd79e7b933bccc442589ed3689a646c1256.tar.gz | |
[GTK] Check for xdg-open at run time
Remove HTML_VIEWER compile-time setting.
If xdg-open doesn't exist use user web browser preference as fallback.
Change-Id: I3b4a4a1a36b0192d75f2c97595f37d0d88a0941e
Reviewed-on: https://code.wireshark.org/review/14805
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b864fc4ce..fcc3ea49ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -658,8 +658,6 @@ if (NOT WIN32) set(M_REQUIRED TRUE) endif() -set(PACKAGELIST ${PACKAGELIST} HtmlViewer) - set(PACKAGELIST ${PACKAGELIST} LIBSSH) set(LIBSSH_OPTIONS "0.6") @@ -816,8 +814,6 @@ foreach(PACKAGE ${PACKAGELIST}) set(PACKAGE_VAR "PYTHONINTERP") elseif(${PACKAGE} STREQUAL "Gettext") set(PACKAGE_VAR "GETTEXT") - elseif(${PACKAGE} STREQUAL "HtmlViewer") - set(PACKAGE_VAR "HTML_VIEWER") elseif(${PACKAGE} STREQUAL "Perl") set(PACKAGE_VAR "PERL") else() |