Commit Graph

4 Commits

Author SHA1 Message Date
David Korth
1d694fe4d7 travis-ci: Fixed builds of the GTK+ frontends.
There were several issues caused by travis-ci using cmake-3.2.2
instead of what I have locally, cmake-3.7.2:

- FIND_PACKAGE(PkgConfig) sets PKG_CONFIG_FOUND, not PkgConfig_FOUND.
- Set cache internal variables instead of parent scope. (Probably not
  needed, but it's a good idea.)
- Older PkgConfig CMake modules don't support PKG_GET_VARIABLE(), so use
  defaults for Nautilus and Thunar extension directories in that case.
- Added diagnostic messages for older PkgConfig.
- Print the cmake version in travis-ci.

Squashed commit of the bugfix/travis-ci-gtk branch.
2017-04-09 13:59:23 -04:00
David Korth
5797958bc4 [cmake] ReplaceHardcodedPrefix.cmake: Split this out of FindLibraryPkgConfig.cmake.
TODO: Make use of it for the KDE4 plugin.
2017-01-09 22:56:37 -05:00
David Korth
91e3c68b99 [cmake] FindLibraryPkgConfig: Replace hard-coded prefixes in extension directory paths with CMAKE_INSTALL_PREFIX.
TODO: Move this to a separate CMake module and use it for KDE4.
2017-01-09 22:31:53 -05:00
David Korth
4a18cdaaa1 [cmake] FindLibraryPkgConfig.cmake: New common CMake file for the various pkgconfig cmakes.
Rewrote FindGLib2, FindGTK3, FindGdkPixbuf2, FindLibNautilusExtension,
and FindThunarX2 to use FIND_LIBRARY_PKG_CONFIG().

Fixed CFLAGS_OTHER on ThunarX2. (Incorrect capitalization.)
2017-01-09 22:08:36 -05:00