From ed1c174157fc39738f8d5d7a2a5d8a10e33e95d5 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 11 Jun 2007 15:50:13 +0000 Subject: Needs by kdegraphics and extragear/libs svn path=/trunk/KDE/kdelibs/; revision=674037 --- modules/FindExiv2.cmake | 82 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 modules/FindExiv2.cmake (limited to 'modules/FindExiv2.cmake') diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake new file mode 100644 index 00000000..bca87294 --- /dev/null +++ b/modules/FindExiv2.cmake @@ -0,0 +1,82 @@ +# - Try to find the Exiv2 library +# Once done this will define +# +# EXIV2_FOUND - system has libexiv2 +# EXIV2_INCLUDE_DIR - the libexiv2 include directory +# EXIV2_LIBRARIES - Link these to use libexiv2 +# EXIV2_DEFINITIONS - Compiler switches required for using libexiv2 +# + +if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) + + # in cache already + SET(EXIV2_FOUND TRUE) + +else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) + if (NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + INCLUDE(UsePkgConfig) + + PKGCONFIG(exiv2 _EXIV2IncDir _EXIV2LinkDir _EXIV2LinkFlags _EXIV2Cflags) + + if(_EXIV2LinkFlags) + # query pkg-config asking for a Exiv2 >= 0.12 + EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.12 exiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) + if(_return_VALUE STREQUAL "0") + message(STATUS "Found Exiv2 release >= 0.12") + set(EXIV2_VERSION_GOOD_FOUND TRUE) + else(_return_VALUE STREQUAL "0") + message(FATAL_ERROR "Found Exiv2 release < 0.12") + endif(_return_VALUE STREQUAL "0") + else(_EXIV2LinkFlags) + set(EXIV2_FOUND FALSE) + set(EXIV2_VERSION_GOOD_FOUND FALSE) + message(FATAL_ERROR "Cannot find Exiv2 library!") + endif(_EXIV2LinkFlags) + + else(NOT WIN32) + #Better check + set(EXIV2_VERSION_GOOD_FOUND TRUE) + endif (NOT WIN32) + + if(EXIV2_VERSION_GOOD_FOUND) + set(EXIV2_DEFINITIONS ${_EXIV2Cflags}) + + FIND_PATH(EXIV2_INCLUDE_DIR exiv2/exif.hpp + ${_EXIV2IncDir} + /usr/include + /usr/local/include + ) + + FIND_LIBRARY(EXIV2_LIBRARIES NAMES exiv2 libexiv2 + PATHS + ${_EXIV2LinkDir} + /usr/lib + /usr/local/lib + ) + + if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) + set(EXIV2_FOUND TRUE) + endif (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) + + if (EXIV2_FOUND) + if (NOT Exiv2_FIND_QUIETLY) + message(STATUS "Found Exiv2: ${EXIV2_LIBRARIES}") + endif (NOT Exiv2_FIND_QUIETLY) + else (EXIV2_FOUND) + if (Exiv2_FIND_REQUIRED) + if (NOT EXIV2_INCLUDE_DIR) + message(FATAL_ERROR "Could NOT find Exiv2 header files") + endif (NOT EXIV2_INCLUDE_DIR) + if (NOT EXIV2_LIBRARIES) + message(FATAL_ERROR "Could NOT find Exiv2 library") + endif (NOT EXIV2_LIBRARIES) + endif (Exiv2_FIND_REQUIRED) + endif (EXIV2_FOUND) + endif(EXIV2_VERSION_GOOD_FOUND) + + MARK_AS_ADVANCED(EXIV2_INCLUDE_DIR EXIV2_LIBRARIES) + +endif (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) + -- cgit v1.2.1 From 5ce570ce42ec5acd658d129f6595679346671208 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 13 Jun 2007 08:19:37 +0000 Subject: Not a FATAL_MESSAGE but a STATUS otherwise it breaks optional_module svn path=/trunk/KDE/kdelibs/; revision=674821 --- modules/FindExiv2.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/FindExiv2.cmake') diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake index bca87294..6e34d60e 100644 --- a/modules/FindExiv2.cmake +++ b/modules/FindExiv2.cmake @@ -27,12 +27,12 @@ else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) message(STATUS "Found Exiv2 release >= 0.12") set(EXIV2_VERSION_GOOD_FOUND TRUE) else(_return_VALUE STREQUAL "0") - message(FATAL_ERROR "Found Exiv2 release < 0.12") + message(STATUS "Found Exiv2 release < 0.12") endif(_return_VALUE STREQUAL "0") else(_EXIV2LinkFlags) set(EXIV2_FOUND FALSE) set(EXIV2_VERSION_GOOD_FOUND FALSE) - message(FATAL_ERROR "Cannot find Exiv2 library!") + message(STATUS "Cannot find Exiv2 library!") endif(_EXIV2LinkFlags) else(NOT WIN32) -- cgit v1.2.1 From c6407c849879bd548c139a715367ec20455b78fc Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sat, 23 Jun 2007 11:58:27 +0000 Subject: Fix logic (When we don't find mini version of lib we must exit) svn path=/trunk/KDE/kdelibs/; revision=679228 --- modules/FindExiv2.cmake | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'modules/FindExiv2.cmake') diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake index 6e34d60e..2f6caa1d 100644 --- a/modules/FindExiv2.cmake +++ b/modules/FindExiv2.cmake @@ -59,22 +59,21 @@ else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) set(EXIV2_FOUND TRUE) endif (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) - - if (EXIV2_FOUND) - if (NOT Exiv2_FIND_QUIETLY) - message(STATUS "Found Exiv2: ${EXIV2_LIBRARIES}") - endif (NOT Exiv2_FIND_QUIETLY) - else (EXIV2_FOUND) - if (Exiv2_FIND_REQUIRED) - if (NOT EXIV2_INCLUDE_DIR) - message(FATAL_ERROR "Could NOT find Exiv2 header files") - endif (NOT EXIV2_INCLUDE_DIR) - if (NOT EXIV2_LIBRARIES) + endif(EXIV2_VERSION_GOOD_FOUND) + if (EXIV2_FOUND) + if (NOT Exiv2_FIND_QUIETLY) + message(STATUS "Found Exiv2: ${EXIV2_LIBRARIES}") + endif (NOT Exiv2_FIND_QUIETLY) + else (EXIV2_FOUND) + if (Exiv2_FIND_REQUIRED) + if (NOT EXIV2_INCLUDE_DIR) + message(FATAL_ERROR "Could NOT find Exiv2 header files") + endif (NOT EXIV2_INCLUDE_DIR) + if (NOT EXIV2_LIBRARIES) message(FATAL_ERROR "Could NOT find Exiv2 library") - endif (NOT EXIV2_LIBRARIES) - endif (Exiv2_FIND_REQUIRED) - endif (EXIV2_FOUND) - endif(EXIV2_VERSION_GOOD_FOUND) + endif (NOT EXIV2_LIBRARIES) + endif (Exiv2_FIND_REQUIRED) + endif (EXIV2_FOUND) MARK_AS_ADVANCED(EXIV2_INCLUDE_DIR EXIV2_LIBRARIES) -- cgit v1.2.1 From a7c4888bb864b525568df10219915c3925d3dd61 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 6 Aug 2007 18:53:48 +0000 Subject: Remove not necessary path svn path=/trunk/KDE/kdelibs/; revision=697081 --- modules/FindExiv2.cmake | 4 ---- 1 file changed, 4 deletions(-) (limited to 'modules/FindExiv2.cmake') diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake index 2f6caa1d..884be4ed 100644 --- a/modules/FindExiv2.cmake +++ b/modules/FindExiv2.cmake @@ -45,15 +45,11 @@ else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) FIND_PATH(EXIV2_INCLUDE_DIR exiv2/exif.hpp ${_EXIV2IncDir} - /usr/include - /usr/local/include ) FIND_LIBRARY(EXIV2_LIBRARIES NAMES exiv2 libexiv2 PATHS ${_EXIV2LinkDir} - /usr/lib - /usr/local/lib ) if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) -- cgit v1.2.1 From 09583bb25791fc4dc0db770b3700f21e18f7d018 Mon Sep 17 00:00:00 2001 From: David Faure Date: Fri, 11 Jul 2008 10:50:51 +0000 Subject: Forwardport 830862, kexiv2 requires exiv2 >= 0.13 for AccessMode. svn path=/trunk/KDE/kdelibs/; revision=830871 --- modules/FindExiv2.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'modules/FindExiv2.cmake') diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake index 884be4ed..5555c92e 100644 --- a/modules/FindExiv2.cmake +++ b/modules/FindExiv2.cmake @@ -17,17 +17,21 @@ else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls INCLUDE(UsePkgConfig) + + if(NOT EXIV2_MIN_VERSION) + set(EXIV2_MIN_VERSION "0.12") + endif(NOT EXIV2_MIN_VERSION) PKGCONFIG(exiv2 _EXIV2IncDir _EXIV2LinkDir _EXIV2LinkFlags _EXIV2Cflags) if(_EXIV2LinkFlags) # query pkg-config asking for a Exiv2 >= 0.12 - EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.12 exiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) + EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${EXIV2_MIN_VERSION} exiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) if(_return_VALUE STREQUAL "0") - message(STATUS "Found Exiv2 release >= 0.12") + message(STATUS "Found Exiv2 release >= ${EXIV2_MIN_VERSION}") set(EXIV2_VERSION_GOOD_FOUND TRUE) else(_return_VALUE STREQUAL "0") - message(STATUS "Found Exiv2 release < 0.12") + message(STATUS "Found Exiv2 release < ${EXIV2_MIN_VERSION}") endif(_return_VALUE STREQUAL "0") else(_EXIV2LinkFlags) set(EXIV2_FOUND FALSE) @@ -54,6 +58,7 @@ else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) set(EXIV2_FOUND TRUE) + # TODO version check is missing endif (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) endif(EXIV2_VERSION_GOOD_FOUND) if (EXIV2_FOUND) -- cgit v1.2.1 From 5d69cd884cefe000851884ea9c3f3ec851fe4122 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 20 Jul 2008 10:26:08 +0000 Subject: FindPCRE.cmake: lowercasing FindSharedMimeInfo.cmake: document SHARED_MIME_INFO_MINIMUM_VERSION and add a comment about the WORKING_DIRECTORY FindGStreamer.cmake: use FIND_PACKAGE_HANDLE_STANDARD_ARGS() FindExiv2.cmake: lowercasing, document EXIV2_MIN_VERSION FindKDE4Internal.cmake: remove empty lines from documentation block so everything is included again in the generated documentation Alex svn path=/trunk/KDE/kdelibs/; revision=835253 --- modules/FindExiv2.cmake | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'modules/FindExiv2.cmake') diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake index 5555c92e..5bef48be 100644 --- a/modules/FindExiv2.cmake +++ b/modules/FindExiv2.cmake @@ -1,4 +1,8 @@ # - Try to find the Exiv2 library +# +# EXIV2_MIN_VERSION - You can set this variable to the minimum version you need +# before doing FIND_PACKAGE(Exiv2). The default is 0.12. +# # Once done this will define # # EXIV2_FOUND - system has libexiv2 @@ -10,23 +14,23 @@ if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) # in cache already - SET(EXIV2_FOUND TRUE) + set(EXIV2_FOUND TRUE) else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) if (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) + include(UsePkgConfig) if(NOT EXIV2_MIN_VERSION) set(EXIV2_MIN_VERSION "0.12") endif(NOT EXIV2_MIN_VERSION) - PKGCONFIG(exiv2 _EXIV2IncDir _EXIV2LinkDir _EXIV2LinkFlags _EXIV2Cflags) + pkgconfig(exiv2 _EXIV2IncDir _EXIV2LinkDir _EXIV2LinkFlags _EXIV2Cflags) if(_EXIV2LinkFlags) # query pkg-config asking for a Exiv2 >= 0.12 - EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${EXIV2_MIN_VERSION} exiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) + exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${EXIV2_MIN_VERSION} exiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) if(_return_VALUE STREQUAL "0") message(STATUS "Found Exiv2 release >= ${EXIV2_MIN_VERSION}") set(EXIV2_VERSION_GOOD_FOUND TRUE) @@ -47,11 +51,11 @@ else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) if(EXIV2_VERSION_GOOD_FOUND) set(EXIV2_DEFINITIONS ${_EXIV2Cflags}) - FIND_PATH(EXIV2_INCLUDE_DIR exiv2/exif.hpp + find_path(EXIV2_INCLUDE_DIR exiv2/exif.hpp ${_EXIV2IncDir} ) - FIND_LIBRARY(EXIV2_LIBRARIES NAMES exiv2 libexiv2 + find_library(EXIV2_LIBRARIES NAMES exiv2 libexiv2 PATHS ${_EXIV2LinkDir} ) @@ -76,7 +80,7 @@ else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) endif (Exiv2_FIND_REQUIRED) endif (EXIV2_FOUND) - MARK_AS_ADVANCED(EXIV2_INCLUDE_DIR EXIV2_LIBRARIES) + mark_as_advanced(EXIV2_INCLUDE_DIR EXIV2_LIBRARIES) endif (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) -- cgit v1.2.1 From daf29017c6ca5901d7d14918dbbcd326f23e0c5c Mon Sep 17 00:00:00 2001 From: Helio Castro Date: Tue, 11 Nov 2008 15:22:34 +0000 Subject: - Move old test check for new cmake pkg_check_module svn path=/trunk/KDE/kdelibs/; revision=882888 --- modules/FindExiv2.cmake | 101 ++++++++++++++---------------------------------- 1 file changed, 29 insertions(+), 72 deletions(-) (limited to 'modules/FindExiv2.cmake') diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake index 5bef48be..4895b6c4 100644 --- a/modules/FindExiv2.cmake +++ b/modules/FindExiv2.cmake @@ -2,85 +2,42 @@ # # EXIV2_MIN_VERSION - You can set this variable to the minimum version you need # before doing FIND_PACKAGE(Exiv2). The default is 0.12. -# -# Once done this will define -# -# EXIV2_FOUND - system has libexiv2 -# EXIV2_INCLUDE_DIR - the libexiv2 include directory -# EXIV2_LIBRARIES - Link these to use libexiv2 -# EXIV2_DEFINITIONS - Compiler switches required for using libexiv2 # +# All definitions come with new cmake macro PKG_CHECK_MODULES -if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) +if (EXIV2_INCLUDEDIR AND EXIV2_LIBRARIES) # in cache already set(EXIV2_FOUND TRUE) -else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) - if (NOT WIN32) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - include(UsePkgConfig) - - if(NOT EXIV2_MIN_VERSION) - set(EXIV2_MIN_VERSION "0.12") - endif(NOT EXIV2_MIN_VERSION) - - pkgconfig(exiv2 _EXIV2IncDir _EXIV2LinkDir _EXIV2LinkFlags _EXIV2Cflags) - - if(_EXIV2LinkFlags) - # query pkg-config asking for a Exiv2 >= 0.12 - exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${EXIV2_MIN_VERSION} exiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) - if(_return_VALUE STREQUAL "0") - message(STATUS "Found Exiv2 release >= ${EXIV2_MIN_VERSION}") - set(EXIV2_VERSION_GOOD_FOUND TRUE) - else(_return_VALUE STREQUAL "0") - message(STATUS "Found Exiv2 release < ${EXIV2_MIN_VERSION}") - endif(_return_VALUE STREQUAL "0") - else(_EXIV2LinkFlags) - set(EXIV2_FOUND FALSE) - set(EXIV2_VERSION_GOOD_FOUND FALSE) - message(STATUS "Cannot find Exiv2 library!") - endif(_EXIV2LinkFlags) - - else(NOT WIN32) - #Better check - set(EXIV2_VERSION_GOOD_FOUND TRUE) - endif (NOT WIN32) - - if(EXIV2_VERSION_GOOD_FOUND) - set(EXIV2_DEFINITIONS ${_EXIV2Cflags}) - - find_path(EXIV2_INCLUDE_DIR exiv2/exif.hpp - ${_EXIV2IncDir} - ) - - find_library(EXIV2_LIBRARIES NAMES exiv2 libexiv2 - PATHS - ${_EXIV2LinkDir} - ) - - if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) +else (EXIV2_INCLUDEDIR AND EXIV2_LIBRARIES) + if (NOT WIN32) + if(NOT EXIV2_MIN_VERSION) + set(EXIV2_MIN_VERSION "0.12") + endif(NOT EXIV2_MIN_VERSION) + + if (Exiv2_FIND_REQUIRED) + PKG_CHECK_MODULES(EXIV2 REQUIRED exiv2>=${EXIV2_MIN_VERSION}) + else (Exiv2_FIND_REQUIRED) + PKG_CHECK_MODULES(EXIV2 exiv2>=${EXIV2_MIN_VERSION}) + endif (Exiv2_FIND_REQUIRED) + + if(EXIV2_FOUND) + message(STATUS "Found Exiv2 release ${EXIV2_VERSION}") + else(EXIV2_FOUND) + message(STATUS "Cannot find Exiv2 library!") + endif(EXIV2_FOUND) + else(NOT WIN32) + #Better check set(EXIV2_FOUND TRUE) - # TODO version check is missing - endif (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) - endif(EXIV2_VERSION_GOOD_FOUND) - if (EXIV2_FOUND) - if (NOT Exiv2_FIND_QUIETLY) - message(STATUS "Found Exiv2: ${EXIV2_LIBRARIES}") - endif (NOT Exiv2_FIND_QUIETLY) - else (EXIV2_FOUND) - if (Exiv2_FIND_REQUIRED) - if (NOT EXIV2_INCLUDE_DIR) - message(FATAL_ERROR "Could NOT find Exiv2 header files") - endif (NOT EXIV2_INCLUDE_DIR) - if (NOT EXIV2_LIBRARIES) - message(FATAL_ERROR "Could NOT find Exiv2 library") - endif (NOT EXIV2_LIBRARIES) - endif (Exiv2_FIND_REQUIRED) + endif (NOT WIN32) + + if(EXIV2_FOUND) + set(EXIV2_DEFINITIONS ${EXIV2_CFLAGS}) + if (NOT Exiv2_FIND_QUIETLY) + message(STATUS "Found Exiv2: ${EXIV2_LIBRARIES}") + endif (NOT Exiv2_FIND_QUIETLY) endif (EXIV2_FOUND) - mark_as_advanced(EXIV2_INCLUDE_DIR EXIV2_LIBRARIES) - -endif (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) +endif (EXIV2_INCLUDEDIR AND EXIV2_LIBRARIES) -- cgit v1.2.1 From 3c3016a1dff7df3966a1a627e11e9a41a8fadb51 Mon Sep 17 00:00:00 2001 From: Helio Castro Date: Tue, 11 Nov 2008 15:30:12 +0000 Subject: - Fix includedirs and add requires for pkgconfig svn path=/trunk/KDE/kdelibs/; revision=882894 --- modules/FindExiv2.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'modules/FindExiv2.cmake') diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake index 4895b6c4..c16e210b 100644 --- a/modules/FindExiv2.cmake +++ b/modules/FindExiv2.cmake @@ -12,6 +12,8 @@ if (EXIV2_INCLUDEDIR AND EXIV2_LIBRARIES) else (EXIV2_INCLUDEDIR AND EXIV2_LIBRARIES) if (NOT WIN32) + find_package(PkgConfig REQUIRED) + if(NOT EXIV2_MIN_VERSION) set(EXIV2_MIN_VERSION "0.12") endif(NOT EXIV2_MIN_VERSION) -- cgit v1.2.1 From dea5e521618914dad483bbd7cc1e84e43bd3dfed Mon Sep 17 00:00:00 2001 From: Helio Castro Date: Tue, 11 Nov 2008 15:33:55 +0000 Subject: Less verbose svn path=/trunk/KDE/kdelibs/; revision=882897 --- modules/FindExiv2.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'modules/FindExiv2.cmake') diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake index c16e210b..c9d8f539 100644 --- a/modules/FindExiv2.cmake +++ b/modules/FindExiv2.cmake @@ -24,11 +24,9 @@ else (EXIV2_INCLUDEDIR AND EXIV2_LIBRARIES) PKG_CHECK_MODULES(EXIV2 exiv2>=${EXIV2_MIN_VERSION}) endif (Exiv2_FIND_REQUIRED) - if(EXIV2_FOUND) - message(STATUS "Found Exiv2 release ${EXIV2_VERSION}") - else(EXIV2_FOUND) + if(NOT EXIV2_FOUND) message(STATUS "Cannot find Exiv2 library!") - endif(EXIV2_FOUND) + endif(NOT EXIV2_FOUND) else(NOT WIN32) #Better check set(EXIV2_FOUND TRUE) -- cgit v1.2.1 From 9b429eb292024c8c5eafb5d052606f0661af7662 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 14 Nov 2008 18:17:03 +0000 Subject: Revert those files back to rev 882880 to get them into a known working state again, except FindStrigi.cmake, which seems to be working. Let's start now cleaning them up step by step. Alex CCMAIL: helio@kde.org svn path=/trunk/KDE/kdelibs/; revision=884355 --- modules/FindExiv2.cmake | 101 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 72 insertions(+), 29 deletions(-) (limited to 'modules/FindExiv2.cmake') diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake index c9d8f539..5bef48be 100644 --- a/modules/FindExiv2.cmake +++ b/modules/FindExiv2.cmake @@ -2,42 +2,85 @@ # # EXIV2_MIN_VERSION - You can set this variable to the minimum version you need # before doing FIND_PACKAGE(Exiv2). The default is 0.12. +# +# Once done this will define +# +# EXIV2_FOUND - system has libexiv2 +# EXIV2_INCLUDE_DIR - the libexiv2 include directory +# EXIV2_LIBRARIES - Link these to use libexiv2 +# EXIV2_DEFINITIONS - Compiler switches required for using libexiv2 # -# All definitions come with new cmake macro PKG_CHECK_MODULES -if (EXIV2_INCLUDEDIR AND EXIV2_LIBRARIES) +if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) # in cache already set(EXIV2_FOUND TRUE) -else (EXIV2_INCLUDEDIR AND EXIV2_LIBRARIES) - if (NOT WIN32) - find_package(PkgConfig REQUIRED) - - if(NOT EXIV2_MIN_VERSION) - set(EXIV2_MIN_VERSION "0.12") - endif(NOT EXIV2_MIN_VERSION) - - if (Exiv2_FIND_REQUIRED) - PKG_CHECK_MODULES(EXIV2 REQUIRED exiv2>=${EXIV2_MIN_VERSION}) - else (Exiv2_FIND_REQUIRED) - PKG_CHECK_MODULES(EXIV2 exiv2>=${EXIV2_MIN_VERSION}) - endif (Exiv2_FIND_REQUIRED) - - if(NOT EXIV2_FOUND) - message(STATUS "Cannot find Exiv2 library!") - endif(NOT EXIV2_FOUND) - else(NOT WIN32) - #Better check - set(EXIV2_FOUND TRUE) - endif (NOT WIN32) +else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) + if (NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + include(UsePkgConfig) + + if(NOT EXIV2_MIN_VERSION) + set(EXIV2_MIN_VERSION "0.12") + endif(NOT EXIV2_MIN_VERSION) + + pkgconfig(exiv2 _EXIV2IncDir _EXIV2LinkDir _EXIV2LinkFlags _EXIV2Cflags) - if(EXIV2_FOUND) - set(EXIV2_DEFINITIONS ${EXIV2_CFLAGS}) - if (NOT Exiv2_FIND_QUIETLY) - message(STATUS "Found Exiv2: ${EXIV2_LIBRARIES}") - endif (NOT Exiv2_FIND_QUIETLY) + if(_EXIV2LinkFlags) + # query pkg-config asking for a Exiv2 >= 0.12 + exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${EXIV2_MIN_VERSION} exiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) + if(_return_VALUE STREQUAL "0") + message(STATUS "Found Exiv2 release >= ${EXIV2_MIN_VERSION}") + set(EXIV2_VERSION_GOOD_FOUND TRUE) + else(_return_VALUE STREQUAL "0") + message(STATUS "Found Exiv2 release < ${EXIV2_MIN_VERSION}") + endif(_return_VALUE STREQUAL "0") + else(_EXIV2LinkFlags) + set(EXIV2_FOUND FALSE) + set(EXIV2_VERSION_GOOD_FOUND FALSE) + message(STATUS "Cannot find Exiv2 library!") + endif(_EXIV2LinkFlags) + + else(NOT WIN32) + #Better check + set(EXIV2_VERSION_GOOD_FOUND TRUE) + endif (NOT WIN32) + + if(EXIV2_VERSION_GOOD_FOUND) + set(EXIV2_DEFINITIONS ${_EXIV2Cflags}) + + find_path(EXIV2_INCLUDE_DIR exiv2/exif.hpp + ${_EXIV2IncDir} + ) + + find_library(EXIV2_LIBRARIES NAMES exiv2 libexiv2 + PATHS + ${_EXIV2LinkDir} + ) + + if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) + set(EXIV2_FOUND TRUE) + # TODO version check is missing + endif (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) + endif(EXIV2_VERSION_GOOD_FOUND) + if (EXIV2_FOUND) + if (NOT Exiv2_FIND_QUIETLY) + message(STATUS "Found Exiv2: ${EXIV2_LIBRARIES}") + endif (NOT Exiv2_FIND_QUIETLY) + else (EXIV2_FOUND) + if (Exiv2_FIND_REQUIRED) + if (NOT EXIV2_INCLUDE_DIR) + message(FATAL_ERROR "Could NOT find Exiv2 header files") + endif (NOT EXIV2_INCLUDE_DIR) + if (NOT EXIV2_LIBRARIES) + message(FATAL_ERROR "Could NOT find Exiv2 library") + endif (NOT EXIV2_LIBRARIES) + endif (Exiv2_FIND_REQUIRED) endif (EXIV2_FOUND) -endif (EXIV2_INCLUDEDIR AND EXIV2_LIBRARIES) + mark_as_advanced(EXIV2_INCLUDE_DIR EXIV2_LIBRARIES) + +endif (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) -- cgit v1.2.1 From 87c903a8e853eec433860818a01040da8d1c5f1a Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 4 Jan 2009 15:39:53 +0000 Subject: -add missing copyright notices, I hope I got it right -also a few empty lines here and there to make it look nicer Alex svn path=/trunk/KDE/kdelibs/; revision=905547 --- modules/FindExiv2.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules/FindExiv2.cmake') diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake index 5bef48be..693f5465 100644 --- a/modules/FindExiv2.cmake +++ b/modules/FindExiv2.cmake @@ -11,6 +11,12 @@ # EXIV2_DEFINITIONS - Compiler switches required for using libexiv2 # +# Copyright (c) 2008, Gilles Caulier, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) # in cache already -- cgit v1.2.1 From 27d6fce08ed2e1fdffedca6d4c3de4230ece329a Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Sat, 12 Dec 2009 23:40:04 +0000 Subject: fix find_library to use HINTS rather than PATHS when searching svn path=/trunk/KDE/kdelibs/; revision=1061755 --- modules/FindExiv2.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'modules/FindExiv2.cmake') diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake index 693f5465..f6adbdc9 100644 --- a/modules/FindExiv2.cmake +++ b/modules/FindExiv2.cmake @@ -60,10 +60,11 @@ else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) find_path(EXIV2_INCLUDE_DIR exiv2/exif.hpp ${_EXIV2IncDir} ) - + find_library(EXIV2_LIBRARIES NAMES exiv2 libexiv2 - PATHS + HINTS ${_EXIV2LinkDir} + NO_DEFAULT_PATH ) if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) -- cgit v1.2.1 From 177ccd75bcd6c579311b0e8e0bf9f5e4c565f9da Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Sun, 13 Dec 2009 14:58:34 +0000 Subject: remove NO_DEFAULT_PATH in the find_library() call use HINTS rather than PATHS in the find_path() call svn path=/trunk/KDE/kdelibs/; revision=1062007 --- modules/FindExiv2.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindExiv2.cmake') diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake index f6adbdc9..9306f5b8 100644 --- a/modules/FindExiv2.cmake +++ b/modules/FindExiv2.cmake @@ -58,13 +58,13 @@ else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) set(EXIV2_DEFINITIONS ${_EXIV2Cflags}) find_path(EXIV2_INCLUDE_DIR exiv2/exif.hpp + HINTS ${_EXIV2IncDir} ) find_library(EXIV2_LIBRARIES NAMES exiv2 libexiv2 HINTS ${_EXIV2LinkDir} - NO_DEFAULT_PATH ) if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) -- cgit v1.2.1 From 7cd7dc2f7e8aacbd6722bba5a525714f9337c9f6 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 13 Dec 2009 16:22:20 +0000 Subject: -also use the "NAMES" keyword Alex svn path=/trunk/KDE/kdelibs/; revision=1062039 --- modules/FindExiv2.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindExiv2.cmake') diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake index 9306f5b8..bf8220cc 100644 --- a/modules/FindExiv2.cmake +++ b/modules/FindExiv2.cmake @@ -57,7 +57,7 @@ else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) if(EXIV2_VERSION_GOOD_FOUND) set(EXIV2_DEFINITIONS ${_EXIV2Cflags}) - find_path(EXIV2_INCLUDE_DIR exiv2/exif.hpp + find_path(EXIV2_INCLUDE_DIR NAMES exiv2/exif.hpp HINTS ${_EXIV2IncDir} ) -- cgit v1.2.1 From 073b609b621d9fdec9beeaf3c8d42c41ad2050c0 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 26 Sep 2010 17:30:20 +0000 Subject: basically a rewrite of FindExiv2.cmake, now works also without pkg-config, has proper verison checking using the new extended syntax of find_package_handle_standard_args(), and a clearer path through the code Alex svn path=/trunk/KDE/kdelibs/; revision=1179983 --- modules/FindExiv2.cmake | 137 ++++++++++++++++++++++-------------------------- 1 file changed, 62 insertions(+), 75 deletions(-) (limited to 'modules/FindExiv2.cmake') diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake index bf8220cc..f929269d 100644 --- a/modules/FindExiv2.cmake +++ b/modules/FindExiv2.cmake @@ -1,8 +1,8 @@ # - Try to find the Exiv2 library # -# EXIV2_MIN_VERSION - You can set this variable to the minimum version you need +# EXIV2_MIN_VERSION - You can set this variable to the minimum version you need # before doing FIND_PACKAGE(Exiv2). The default is 0.12. -# +# # Once done this will define # # EXIV2_FOUND - system has libexiv2 @@ -10,84 +10,71 @@ # EXIV2_LIBRARIES - Link these to use libexiv2 # EXIV2_DEFINITIONS - Compiler switches required for using libexiv2 # +# The minimum required version of Exiv2 can be specified using the +# standard syntax, e.g. find_package(Exiv2 0.17) +# +# For compatiblity, also the variable EXIV2_MIN_VERSION can be set to the minimum version +# you need before doing FIND_PACKAGE(Exiv2). The default is 0.12. +# Copyright (c) 2010, Alexander Neundorf, # Copyright (c) 2008, Gilles Caulier, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# Support EXIV2_MIN_VERSION for compatibility: +if(NOT Exiv2_FIND_VERSION) + set(Exiv2_FIND_VERSION "${EXIV2_MIN_VERSION}") +endif(NOT Exiv2_FIND_VERSION) + +# the minimum version of exiv2 we require +if(NOT Exiv2_FIND_VERSION) + set(Exiv2_FIND_VERSION "0.12") +endif(NOT Exiv2_FIND_VERSION) + + +if (NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + find_package(PkgConfig) + pkg_check_modules(PC_EXIV2 QUIET exiv2) + set(EXIV2_DEFINITIONS ${PC_EXIV2_CFLAGS_OTHER}) +endif (NOT WIN32) + + +find_path(EXIV2_INCLUDE_DIR NAMES exiv2/exif.hpp + HINTS + ${PC_EXIV2_INCLUDEDIR} + ${PC_EXIV2_INCLUDE_DIRS} + ) + +find_library(EXIV2_LIBRARY NAMES exiv2 libexiv2 + HINTS + ${PC_EXIV2_LIBDIR} + ${PC_EXIV2_LIBRARY_DIRS} + ) + + +# Get the version number from exiv2/version.hpp and store it in the cache: +if(EXIV2_INCLUDE_DIR AND NOT EXIV2_VERSION) + file(READ ${EXIV2_INCLUDE_DIR}/exiv2/version.hpp EXIV2_VERSION_CONTENT) + string(REGEX MATCH "#define EXIV2_MAJOR_VERSION +\\( *([0-9]+) *\\)" _dummy "${EXIV2_VERSION_CONTENT}") + set(EXIV2_VERSION_MAJOR "${CMAKE_MATCH_1}") + + string(REGEX MATCH "#define EXIV2_MINOR_VERSION +\\( *([0-9]+) *\\)" _dummy "${EXIV2_VERSION_CONTENT}") + set(EXIV2_VERSION_MINOR "${CMAKE_MATCH_1}") + + string(REGEX MATCH "#define EXIV2_PATCH_VERSION +\\( *([0-9]+) *\\)" _dummy "${EXIV2_VERSION_CONTENT}") + set(EXIV2_VERSION_PATCH "${CMAKE_MATCH_1}") + + set(EXIV2_VERSION "${EXIV2_VERSION_MAJOR}.${EXIV2_VERSION_MINOR}.${EXIV2_VERSION_PATCH}" CACHE STRING "Version number of Exiv2" FORCE) +endif(EXIV2_INCLUDE_DIR AND NOT EXIV2_VERSION) + +set(EXIV2_LIBRARIES "${EXIV2_LIBRARY}") + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Exiv2 REQUIRED_VARS EXIV2_LIBRARY EXIV2_INCLUDE_DIR + VERSION_VAR EXIV2_VERSION) -if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) - - # in cache already - set(EXIV2_FOUND TRUE) - -else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) - if (NOT WIN32) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - include(UsePkgConfig) - - if(NOT EXIV2_MIN_VERSION) - set(EXIV2_MIN_VERSION "0.12") - endif(NOT EXIV2_MIN_VERSION) - - pkgconfig(exiv2 _EXIV2IncDir _EXIV2LinkDir _EXIV2LinkFlags _EXIV2Cflags) - - if(_EXIV2LinkFlags) - # query pkg-config asking for a Exiv2 >= 0.12 - exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${EXIV2_MIN_VERSION} exiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) - if(_return_VALUE STREQUAL "0") - message(STATUS "Found Exiv2 release >= ${EXIV2_MIN_VERSION}") - set(EXIV2_VERSION_GOOD_FOUND TRUE) - else(_return_VALUE STREQUAL "0") - message(STATUS "Found Exiv2 release < ${EXIV2_MIN_VERSION}") - endif(_return_VALUE STREQUAL "0") - else(_EXIV2LinkFlags) - set(EXIV2_FOUND FALSE) - set(EXIV2_VERSION_GOOD_FOUND FALSE) - message(STATUS "Cannot find Exiv2 library!") - endif(_EXIV2LinkFlags) - - else(NOT WIN32) - #Better check - set(EXIV2_VERSION_GOOD_FOUND TRUE) - endif (NOT WIN32) - - if(EXIV2_VERSION_GOOD_FOUND) - set(EXIV2_DEFINITIONS ${_EXIV2Cflags}) - - find_path(EXIV2_INCLUDE_DIR NAMES exiv2/exif.hpp - HINTS - ${_EXIV2IncDir} - ) - - find_library(EXIV2_LIBRARIES NAMES exiv2 libexiv2 - HINTS - ${_EXIV2LinkDir} - ) - - if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) - set(EXIV2_FOUND TRUE) - # TODO version check is missing - endif (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) - endif(EXIV2_VERSION_GOOD_FOUND) - if (EXIV2_FOUND) - if (NOT Exiv2_FIND_QUIETLY) - message(STATUS "Found Exiv2: ${EXIV2_LIBRARIES}") - endif (NOT Exiv2_FIND_QUIETLY) - else (EXIV2_FOUND) - if (Exiv2_FIND_REQUIRED) - if (NOT EXIV2_INCLUDE_DIR) - message(FATAL_ERROR "Could NOT find Exiv2 header files") - endif (NOT EXIV2_INCLUDE_DIR) - if (NOT EXIV2_LIBRARIES) - message(FATAL_ERROR "Could NOT find Exiv2 library") - endif (NOT EXIV2_LIBRARIES) - endif (Exiv2_FIND_REQUIRED) - endif (EXIV2_FOUND) - - mark_as_advanced(EXIV2_INCLUDE_DIR EXIV2_LIBRARIES) - -endif (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES) +mark_as_advanced(EXIV2_INCLUDE_DIR EXIV2_LIBRARY) -- cgit v1.2.1