From eddf17c68274c3e8ecf86a13858243159ffe9714 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Sun, 23 Apr 2017 10:01:40 +0200 Subject: cmake/signal-protocol: shared lib, mark_as_advanced and others --- cmake/FindGDKPixbuf2.cmake | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'cmake/FindGDKPixbuf2.cmake') diff --git a/cmake/FindGDKPixbuf2.cmake b/cmake/FindGDKPixbuf2.cmake index d100deea..3b7eaf5d 100644 --- a/cmake/FindGDKPixbuf2.cmake +++ b/cmake/FindGDKPixbuf2.cmake @@ -8,17 +8,16 @@ find_pkg_config_with_fallback(GDKPixbuf2 ) if(GDKPixbuf2_FOUND AND NOT GDKPixbuf2_VERSION) - find_path(GDKPixbuf2_INCLUDE_DIR "gdk-pixbuf/gdk-pixbuf.h" HINTS ${GDKPixbuf2_INCLUDE_DIRS}) + find_file(GDKPixbuf2_FEATURES_HEADER "gdk-pixbuf/gdk-pixbuf-features.h" HINTS ${GDKPixbuf2_INCLUDE_DIRS}) + mark_as_advanced(GDKPixbuf2_FEATURES_HEADER) - if(GDKPixbuf2_INCLUDE_DIR) - file(STRINGS "${GDKPixbuf2_INCLUDE_DIR}/gdk-pixbuf/gdk-pixbuf-features.h" GDKPixbuf2_VERSION REGEX "^#define GDK_PIXBUF_VERSION \\\"[^\\\"]+\\\"") + if(GDKPixbuf2_FEATURES_HEADER) + file(STRINGS "${GDKPixbuf2_FEATURES_HEADER}" GDKPixbuf2_VERSION REGEX "^#define GDK_PIXBUF_VERSION \\\"[^\\\"]+\\\"") string(REGEX REPLACE "^#define GDK_PIXBUF_VERSION \\\"([0-9]+)\\.([0-9]+)\\.([0-9]+)\\\"$" "\\1.\\2.\\3" GDKPixbuf2_VERSION "${GDKPixbuf2_VERSION}") endif() endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(GDKPixbuf2 - FOUND_VAR GDKPixbuf2_FOUND REQUIRED_VARS GDKPixbuf2_LIBRARY - VERSION_VAR GDKPixbuf2_VERSION -) \ No newline at end of file + VERSION_VAR GDKPixbuf2_VERSION) \ No newline at end of file -- cgit v1.2.3-54-g00ecf