diff options
| author | Antenore Gatta <antenore@simbiosi.org> | 2018-05-20 23:33:50 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-20 23:33:50 +0300 |
| commit | 4c00ae764edf72525fd47680c55eec0816ac446c (patch) | |
| tree | 23b9e5d7e7c53d44578000d176f694a3b74c8641 | |
| parent | 3ab611d9cff821eeca7700dc64fba883aa81fab0 (diff) | |
| parent | 2fa18fb963a813f213f79c3de2857c14874c29fc (diff) | |
Merge pull request #1639 from FreeRDP/findappindicatorv1.2.30
Fix ayatana libappindicator cmake search
| -rw-r--r-- | cmake/FindAPPINDICATOR.cmake | 5 | ||||
| -rw-r--r-- | src/remmina_icon.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/cmake/FindAPPINDICATOR.cmake b/cmake/FindAPPINDICATOR.cmake index 9dd46fb66..96eb854ea 100644 --- a/cmake/FindAPPINDICATOR.cmake +++ b/cmake/FindAPPINDICATOR.cmake @@ -24,9 +24,9 @@ include(FindPackageHandleStandardArgs) # Try with ayatana-libappindicator pkg_check_modules(PC_AYATANA_APPINDICATOR ayatana-appindicator3-0.1) -find_path(AYATANA_APPINDICATOR_INCLUDE_DIR NAMES app-indicator.h +find_path(AYATANA_APPINDICATOR_INCLUDE_DIR NAMES libayatana-appindicator/app-indicator.h HINTS ${PC_AYATANA_APPINDICATOR_INCLUDEDIR} ${PC_AYATANA_APPINDICATOR_INCLUDE_DIRS} - PATH_SUFFIXES libayatana-appindicator3-0.1/libayatana-appindicator) + PATH_SUFFIXES libayatana-appindicator3-0.1) find_library(AYATANA_APPINDICATOR_LIBRARY NAMES ayatana-appindicator3) @@ -35,6 +35,7 @@ if (AYATANA_APPINDICATOR_INCLUDE_DIR AND AYATANA_APPINDICATOR_LIBRARY) endif() if (APPINDICATOR_FOUND) + add_definitions(-DHAVE_AYATANA_LIBAPPINDICATOR) set(APPINDICATOR_LIBRARIES ${AYATANA_APPINDICATOR_LIBRARY}) set(APPINDICATOR_INCLUDE_DIRS ${AYATANA_APPINDICATOR_INCLUDE_DIR}) else() diff --git a/src/remmina_icon.c b/src/remmina_icon.c index 689f7fe8c..7d9252891 100644 --- a/src/remmina_icon.c +++ b/src/remmina_icon.c @@ -49,7 +49,11 @@ #include "remmina_sysinfo.h" #ifdef HAVE_LIBAPPINDICATOR -#include <libappindicator/app-indicator.h> + #ifdef HAVE_AYATANA_LIBAPPINDICATOR + #include <libayatana-appindicator/app-indicator.h> + #else + #include <libappindicator/app-indicator.h> + #endif #endif typedef struct _RemminaIcon { |