From 75a845abfe4823837e3f07274911dc275150f5a4 Mon Sep 17 00:00:00 2001 From: seebk Date: Sat, 21 Nov 2015 09:48:41 +0000 Subject: [PATCH 001/113] Only require glib 2.40 when tests are build, without tests glib 2.26 is sufficient --- CMakeLists.txt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ceac8fc..21f082b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,10 +85,16 @@ IF(WIN32) ENDIF() ENDIF() -# find dependencies -# NOTE: must be one of the macros listed in https://developer.gnome.org/glib/stable/glib-Version-Information.html -SET(LENSFUN_GLIB_REQUIREMENT_MACRO "GLIB_VERSION_2_40") -FIND_PACKAGE(GLIB2 REQUIRED 2.40) + +IF (BUILD_TESTS) + # automatic tests need at least glib version 2.40 + # NOTE: must be one of the macros listed in https://developer.gnome.org/glib/stable/glib-Version-Information.html + SET(LENSFUN_GLIB_REQUIREMENT_MACRO "GLIB_VERSION_2_40") + FIND_PACKAGE(GLIB2 REQUIRED) +ELSE() + SET(LENSFUN_GLIB_REQUIREMENT_MACRO "GLIB_VERSION_2_26") + FIND_PACKAGE(GLIB2 REQUIRED) +ENDIF() INCLUDE_DIRECTORIES(SYSTEM ${GLIB2_INCLUDE_DIRS}) -- 2.7.4