From 7160513cae73e0b55f2175d4b258a59c8db5124b Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 18 Jun 2007 06:35:01 +0000 Subject: Move into kdelibs needs by digikam/libkipip-plugins svn path=/trunk/KDE/kdelibs/; revision=676983 --- modules/FindKexiv2.cmake | 99 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 modules/FindKexiv2.cmake (limited to 'modules/FindKexiv2.cmake') diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake new file mode 100644 index 00000000..b8c54a2a --- /dev/null +++ b/modules/FindKexiv2.cmake @@ -0,0 +1,99 @@ +# - Try to find the KExiv2 library +# Once done this will define +# +# KEXIV2_FOUND - system has libkexiv2 +# KEXIV2_INCLUDE_DIR - the libkexiv2 include directory +# KEXIV2_LIBRARIES - Link these to use libkexiv2 +# KEXIV2_DEFINITIONS - Compiler switches required for using libkexiv2 +# + +if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) + + message(STATUS "Found Kexiv2 library in cache: ${KEXIV2_LIBRARIES}") + + # in cache already + SET(KEXIV2_FOUND TRUE) + +else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) + + message(STATUS "Check Kexiv2 library in local sub-folder...") + + # Check if library is not in local sub-folder + + FIND_FILE(KEXIV2_LOCAL_FOUND libkexiv2/version.h ${CMAKE_SOURCE_DIR}/libkexiv2 NO_DEFAULT_PATH) + + if (KEXIV2_LOCAL_FOUND) + + set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkexiv2) + set(KEXIV2_DEFINITIONS -I${KEXIV2_INCLUDE_DIR}) + set(KEXIV2_LIBRARIES ${CMAKE_BINARY_DIR}/lib/libkexiv2.so) + message(STATUS "Found Kexiv2 library in local sub-folder: ${KEXIV2_LIBRARIES}") + set(KEXIV2_FOUND TRUE) + MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES) + + else(KEXIV2_LOCAL_FOUND) + + message(STATUS "Check Kexiv2 library using pkg-config...") + + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + INCLUDE(UsePkgConfig) + + PKGCONFIG(libkexiv2 _KEXIV2IncDir _KEXIV2LinkDir _KEXIV2LinkFlags _KEXIV2Cflags) + + if(_KEXIV2LinkFlags) + # query pkg-config asking for a libkexiv2 >= 0.2.0 + EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkexiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) + if(_return_VALUE STREQUAL "0") + message(STATUS "Found libkexiv2 release >= 0.2.0") + set(KEXIV2_VERSION_GOOD_FOUND TRUE) + else(_return_VALUE STREQUAL "0") + message(FATAL_ERROR "Found libkexiv2 release < 0.2.0") + endif(_return_VALUE STREQUAL "0") + else(_KEXIV2LinkFlags) + set(KEXIV2_VERSION_GOOD_FOUND FALSE) + set(KEXIV2_FOUND FALSE) + message(FATAL_ERROR "Could NOT find libkexiv2 library!") + endif(_KEXIV2LinkFlags) + + if(KEXIV2_VERSION_GOOD_FOUND) + set(KEXIV2_DEFINITIONS ${_KEXIV2Cflags}) + + FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h + ${_KEXIV2IncDir} + /usr/include + /usr/local/include + ) + + FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2 + PATHS + ${_KEXIV2LinkDir} + /usr/lib + /usr/local/lib + ) + + if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) + set(KEXIV2_FOUND TRUE) + endif (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) + + if (KEXIV2_FOUND) + if (NOT Kexiv2_FIND_QUIETLY) + message(STATUS "Found libkexiv2: ${KEXIV2_LIBRARIES}") + endif (NOT Kexiv2_FIND_QUIETLY) + else (KEXIV2_FOUND) + if (Kexiv2_FIND_REQUIRED) + if (NOT KEXIV2_INCLUDE_DIR) + message(FATAL_ERROR "Could NOT find libkexiv2 header files") + endif (NOT KEXIV2_INCLUDE_DIR) + if (NOT KEXIV2_LIBRARIES) + message(FATAL_ERROR "Could NOT find libkexiv2 library") + endif (NOT KEXIV2_LIBRARIES) + endif (Kexiv2_FIND_REQUIRED) + endif (KEXIV2_FOUND) + endif(KEXIV2_VERSION_GOOD_FOUND) + + MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES) + + endif(KEXIV2_LOCAL_FOUND) + +endif (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) -- cgit v1.2.1 From e85c078c9a31bb5a50526bb4a734c4812ea682ca Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 18 Jun 2007 06:40:59 +0000 Subject: don't try to use pkgconfig under Windows svn path=/trunk/KDE/kdelibs/; revision=676990 --- modules/FindKexiv2.cmake | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'modules/FindKexiv2.cmake') diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake index b8c54a2a..a9eca2dc 100644 --- a/modules/FindKexiv2.cmake +++ b/modules/FindKexiv2.cmake @@ -32,16 +32,16 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES) else(KEXIV2_LOCAL_FOUND) + if(NOT WIN32) + message(STATUS "Check Kexiv2 library using pkg-config...") - message(STATUS "Check Kexiv2 library using pkg-config...") - - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + INCLUDE(UsePkgConfig) - PKGCONFIG(libkexiv2 _KEXIV2IncDir _KEXIV2LinkDir _KEXIV2LinkFlags _KEXIV2Cflags) + PKGCONFIG(libkexiv2 _KEXIV2IncDir _KEXIV2LinkDir _KEXIV2LinkFlags _KEXIV2Cflags) - if(_KEXIV2LinkFlags) + if(_KEXIV2LinkFlags) # query pkg-config asking for a libkexiv2 >= 0.2.0 EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkexiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) if(_return_VALUE STREQUAL "0") @@ -50,12 +50,15 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) else(_return_VALUE STREQUAL "0") message(FATAL_ERROR "Found libkexiv2 release < 0.2.0") endif(_return_VALUE STREQUAL "0") - else(_KEXIV2LinkFlags) + else(_KEXIV2LinkFlags) set(KEXIV2_VERSION_GOOD_FOUND FALSE) set(KEXIV2_FOUND FALSE) message(FATAL_ERROR "Could NOT find libkexiv2 library!") - endif(_KEXIV2LinkFlags) - + endif(_KEXIV2LinkFlags) + else(NOT WIN32) + set(KEXIV2_VERSION_GOOD_FOUND TRUE) + endif(NOT WIN32) + if(KEXIV2_VERSION_GOOD_FOUND) set(KEXIV2_DEFINITIONS ${_KEXIV2Cflags}) -- cgit v1.2.1 From c03f75251d402279374ff280fedadaaa04112ee4 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 20 Jun 2007 18:32:05 +0000 Subject: link against a library so that cmake can actually figure out the dependencies and parallel build doesn't break. Hopefully with that, dashboard will finally be able to compile extragear-libs. Its been weeks. Yay. svn path=/trunk/KDE/kdelibs/; revision=678125 --- modules/FindKexiv2.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindKexiv2.cmake') diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake index a9eca2dc..e292334b 100644 --- a/modules/FindKexiv2.cmake +++ b/modules/FindKexiv2.cmake @@ -26,7 +26,7 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkexiv2) set(KEXIV2_DEFINITIONS -I${KEXIV2_INCLUDE_DIR}) - set(KEXIV2_LIBRARIES ${CMAKE_BINARY_DIR}/lib/libkexiv2.so) + set(KEXIV2_LIBRARIES kexiv2) message(STATUS "Found Kexiv2 library in local sub-folder: ${KEXIV2_LIBRARIES}") set(KEXIV2_FOUND TRUE) MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES) -- 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/FindKexiv2.cmake | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'modules/FindKexiv2.cmake') diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake index e292334b..8093fbd4 100644 --- a/modules/FindKexiv2.cmake +++ b/modules/FindKexiv2.cmake @@ -78,22 +78,21 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) set(KEXIV2_FOUND TRUE) endif (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) - - if (KEXIV2_FOUND) - if (NOT Kexiv2_FIND_QUIETLY) - message(STATUS "Found libkexiv2: ${KEXIV2_LIBRARIES}") - endif (NOT Kexiv2_FIND_QUIETLY) - else (KEXIV2_FOUND) - if (Kexiv2_FIND_REQUIRED) - if (NOT KEXIV2_INCLUDE_DIR) - message(FATAL_ERROR "Could NOT find libkexiv2 header files") - endif (NOT KEXIV2_INCLUDE_DIR) - if (NOT KEXIV2_LIBRARIES) - message(FATAL_ERROR "Could NOT find libkexiv2 library") - endif (NOT KEXIV2_LIBRARIES) - endif (Kexiv2_FIND_REQUIRED) - endif (KEXIV2_FOUND) - endif(KEXIV2_VERSION_GOOD_FOUND) + endif(KEXIV2_VERSION_GOOD_FOUND) + if (KEXIV2_FOUND) + if (NOT Kexiv2_FIND_QUIETLY) + message(STATUS "Found libkexiv2: ${KEXIV2_LIBRARIES}") + endif (NOT Kexiv2_FIND_QUIETLY) + else (KEXIV2_FOUND) + if (Kexiv2_FIND_REQUIRED) + if (NOT KEXIV2_INCLUDE_DIR) + message(FATAL_ERROR "Could NOT find libkexiv2 header files") + endif (NOT KEXIV2_INCLUDE_DIR) + if (NOT KEXIV2_LIBRARIES) + message(FATAL_ERROR "Could NOT find libkexiv2 library") + endif (NOT KEXIV2_LIBRARIES) + endif (Kexiv2_FIND_REQUIRED) + endif (KEXIV2_FOUND) MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES) -- cgit v1.2.1 From b3c293e69d2e14c2fb22b8dbbf41861e24314e7b Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 3 Jul 2007 16:49:24 +0000 Subject: do not issue a FATAL_ERROR if the library was not found, and the module is not REQUIRED svn path=/trunk/KDE/kdelibs/; revision=682901 --- modules/FindKexiv2.cmake | 1 - 1 file changed, 1 deletion(-) (limited to 'modules/FindKexiv2.cmake') diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake index 8093fbd4..0d42a747 100644 --- a/modules/FindKexiv2.cmake +++ b/modules/FindKexiv2.cmake @@ -53,7 +53,6 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) else(_KEXIV2LinkFlags) set(KEXIV2_VERSION_GOOD_FOUND FALSE) set(KEXIV2_FOUND FALSE) - message(FATAL_ERROR "Could NOT find libkexiv2 library!") endif(_KEXIV2LinkFlags) else(NOT WIN32) set(KEXIV2_VERSION_GOOD_FOUND TRUE) -- 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/FindKexiv2.cmake | 2 -- 1 file changed, 2 deletions(-) (limited to 'modules/FindKexiv2.cmake') diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake index 0d42a747..68df0c1e 100644 --- a/modules/FindKexiv2.cmake +++ b/modules/FindKexiv2.cmake @@ -70,8 +70,6 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2 PATHS ${_KEXIV2LinkDir} - /usr/lib - /usr/local/lib ) if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) -- cgit v1.2.1 From 5d418dcdf5faf708d61790ef19e56f8c30aa1c97 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 14 Aug 2007 07:16:00 +0000 Subject: Other clean svn path=/trunk/KDE/kdelibs/; revision=699883 --- modules/FindKexiv2.cmake | 2 -- 1 file changed, 2 deletions(-) (limited to 'modules/FindKexiv2.cmake') diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake index 68df0c1e..f9d73ce1 100644 --- a/modules/FindKexiv2.cmake +++ b/modules/FindKexiv2.cmake @@ -63,8 +63,6 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h ${_KEXIV2IncDir} - /usr/include - /usr/local/include ) FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2 -- cgit v1.2.1 From f73e58154385cbf67296ba52c616d37164340eb0 Mon Sep 17 00:00:00 2001 From: Tuomas Suutari Date: Mon, 20 Aug 2007 12:54:23 +0000 Subject: When finding an optional library don't fail if old version is found. Just mark as not found. Will still fail at the end if finding a required library. svn path=/trunk/KDE/kdelibs/; revision=702344 --- modules/FindKexiv2.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'modules/FindKexiv2.cmake') diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake index f9d73ce1..3365d7e1 100644 --- a/modules/FindKexiv2.cmake +++ b/modules/FindKexiv2.cmake @@ -48,7 +48,9 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) message(STATUS "Found libkexiv2 release >= 0.2.0") set(KEXIV2_VERSION_GOOD_FOUND TRUE) else(_return_VALUE STREQUAL "0") - message(FATAL_ERROR "Found libkexiv2 release < 0.2.0") + message(STATUS "Found libkexiv2 release < 0.2.0, too old") + set(KEXIV2_VERSION_GOOD_FOUND FALSE) + set(KEXIV2_FOUND FALSE) endif(_return_VALUE STREQUAL "0") else(_KEXIV2LinkFlags) set(KEXIV2_VERSION_GOOD_FOUND FALSE) -- cgit v1.2.1 From de28279ebeb82d922f75294df81c211972936287 Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Tue, 28 Aug 2007 15:10:15 +0000 Subject: these files have been renamed svn path=/trunk/KDE/kdelibs/; revision=705782 --- modules/FindKexiv2.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindKexiv2.cmake') diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake index 3365d7e1..a94658ea 100644 --- a/modules/FindKexiv2.cmake +++ b/modules/FindKexiv2.cmake @@ -20,7 +20,7 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) # Check if library is not in local sub-folder - FIND_FILE(KEXIV2_LOCAL_FOUND libkexiv2/version.h ${CMAKE_SOURCE_DIR}/libkexiv2 NO_DEFAULT_PATH) + FIND_FILE(KEXIV2_LOCAL_FOUND libkexiv2/version.h.cmake ${CMAKE_SOURCE_DIR}/libkexiv2 NO_DEFAULT_PATH) if (KEXIV2_LOCAL_FOUND) -- cgit v1.2.1 From 1c2cdb9af5e5c766014dcd7396e94af7cae25872 Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 2 Oct 2007 23:04:35 +0000 Subject: When looking for local libs in extragear, allow extragear to be configured as a whole instead of per-subdir. svn path=/trunk/KDE/kdelibs/; revision=720306 --- modules/FindKexiv2.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindKexiv2.cmake') diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake index a94658ea..f493da41 100644 --- a/modules/FindKexiv2.cmake +++ b/modules/FindKexiv2.cmake @@ -20,7 +20,7 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) # Check if library is not in local sub-folder - FIND_FILE(KEXIV2_LOCAL_FOUND libkexiv2/version.h.cmake ${CMAKE_SOURCE_DIR}/libkexiv2 NO_DEFAULT_PATH) + FIND_FILE(KEXIV2_LOCAL_FOUND libkexiv2/version.h.cmake ${CMAKE_SOURCE_DIR}/libkexiv2 ${CMAKE_SOURCE_DIR}/libs/libkexiv2 NO_DEFAULT_PATH) if (KEXIV2_LOCAL_FOUND) -- cgit v1.2.1 From 2c295cadb5ee1ef26c5de02ede5548cda5d14b6a Mon Sep 17 00:00:00 2001 From: David Faure Date: Fri, 2 Nov 2007 18:07:21 +0000 Subject: Fix configuring extragear as a single module; to set the right paths we need to determine if we found the file in libfoo or in libs/libfoo. svn path=/trunk/KDE/kdelibs/; revision=732065 --- modules/FindKexiv2.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'modules/FindKexiv2.cmake') diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake index f493da41..da19ff8e 100644 --- a/modules/FindKexiv2.cmake +++ b/modules/FindKexiv2.cmake @@ -19,15 +19,20 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) message(STATUS "Check Kexiv2 library in local sub-folder...") # Check if library is not in local sub-folder - + FIND_FILE(KEXIV2_LOCAL_FOUND libkexiv2/version.h.cmake ${CMAKE_SOURCE_DIR}/libkexiv2 ${CMAKE_SOURCE_DIR}/libs/libkexiv2 NO_DEFAULT_PATH) if (KEXIV2_LOCAL_FOUND) - set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkexiv2) + FIND_FILE(KEXIV2_LOCAL_FOUND_IN_LIBS libkexiv2/version.h.cmake ${CMAKE_SOURCE_DIR}/libs/libkexiv2 NO_DEFAULT_PATH) + if (KEXIV2_LOCAL_FOUND_IN_LIBS) + set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libs/libkexiv2) + else (KEXIV2_LOCAL_FOUND_IN_LIBS) + set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkexiv2) + endif (KEXIV2_LOCAL_FOUND_IN_LIBS) set(KEXIV2_DEFINITIONS -I${KEXIV2_INCLUDE_DIR}) set(KEXIV2_LIBRARIES kexiv2) - message(STATUS "Found Kexiv2 library in local sub-folder: ${KEXIV2_LIBRARIES}") + message(STATUS "Found Kexiv2 library in local sub-folder: ${KEXIV2_INCLUDE_DIR}") set(KEXIV2_FOUND TRUE) MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES) -- cgit v1.2.1 From bb012c0137bf6f3cc54ae0ee97c357c07e660383 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 30 Nov 2007 10:39:36 +0000 Subject: merge in the whitespace handling fixes from cmake 2.4.7 to make extragear-graphics work svn path=/trunk/KDE/kdelibs/; revision=743254 --- modules/FindKexiv2.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/FindKexiv2.cmake') diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake index da19ff8e..c57ed1c2 100644 --- a/modules/FindKexiv2.cmake +++ b/modules/FindKexiv2.cmake @@ -30,7 +30,7 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) else (KEXIV2_LOCAL_FOUND_IN_LIBS) set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkexiv2) endif (KEXIV2_LOCAL_FOUND_IN_LIBS) - set(KEXIV2_DEFINITIONS -I${KEXIV2_INCLUDE_DIR}) + set(KEXIV2_DEFINITIONS "-I${KEXIV2_INCLUDE_DIR}") set(KEXIV2_LIBRARIES kexiv2) message(STATUS "Found Kexiv2 library in local sub-folder: ${KEXIV2_INCLUDE_DIR}") set(KEXIV2_FOUND TRUE) @@ -66,7 +66,7 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) endif(NOT WIN32) if(KEXIV2_VERSION_GOOD_FOUND) - set(KEXIV2_DEFINITIONS ${_KEXIV2Cflags}) + set(KEXIV2_DEFINITIONS "${_KEXIV2Cflags}") FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h ${_KEXIV2IncDir} -- cgit v1.2.1 From 03123bdd3411bafedaf653f5924bab8b17b6d88b Mon Sep 17 00:00:00 2001 From: Helio Castro Date: Tue, 11 Nov 2008 16:32:40 +0000 Subject: Embracing new cmake, another module moving to pkg_check_modules svn path=/trunk/KDE/kdelibs/; revision=882917 --- modules/FindKexiv2.cmake | 122 ++++++++--------------------------------------- 1 file changed, 21 insertions(+), 101 deletions(-) (limited to 'modules/FindKexiv2.cmake') diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake index c57ed1c2..f96631a7 100644 --- a/modules/FindKexiv2.cmake +++ b/modules/FindKexiv2.cmake @@ -1,103 +1,23 @@ -# - Try to find the KExiv2 library -# Once done this will define -# -# KEXIV2_FOUND - system has libkexiv2 -# KEXIV2_INCLUDE_DIR - the libkexiv2 include directory -# KEXIV2_LIBRARIES - Link these to use libkexiv2 -# KEXIV2_DEFINITIONS - Compiler switches required for using libkexiv2 -# - -if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) - - message(STATUS "Found Kexiv2 library in cache: ${KEXIV2_LIBRARIES}") - - # in cache already - SET(KEXIV2_FOUND TRUE) - -else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) - - message(STATUS "Check Kexiv2 library in local sub-folder...") - - # Check if library is not in local sub-folder - - FIND_FILE(KEXIV2_LOCAL_FOUND libkexiv2/version.h.cmake ${CMAKE_SOURCE_DIR}/libkexiv2 ${CMAKE_SOURCE_DIR}/libs/libkexiv2 NO_DEFAULT_PATH) - - if (KEXIV2_LOCAL_FOUND) - - FIND_FILE(KEXIV2_LOCAL_FOUND_IN_LIBS libkexiv2/version.h.cmake ${CMAKE_SOURCE_DIR}/libs/libkexiv2 NO_DEFAULT_PATH) - if (KEXIV2_LOCAL_FOUND_IN_LIBS) - set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libs/libkexiv2) - else (KEXIV2_LOCAL_FOUND_IN_LIBS) - set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkexiv2) - endif (KEXIV2_LOCAL_FOUND_IN_LIBS) - set(KEXIV2_DEFINITIONS "-I${KEXIV2_INCLUDE_DIR}") - set(KEXIV2_LIBRARIES kexiv2) - message(STATUS "Found Kexiv2 library in local sub-folder: ${KEXIV2_INCLUDE_DIR}") - set(KEXIV2_FOUND TRUE) - MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES) - - else(KEXIV2_LOCAL_FOUND) - if(NOT WIN32) - message(STATUS "Check Kexiv2 library using pkg-config...") - - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) - - PKGCONFIG(libkexiv2 _KEXIV2IncDir _KEXIV2LinkDir _KEXIV2LinkFlags _KEXIV2Cflags) - - if(_KEXIV2LinkFlags) - # query pkg-config asking for a libkexiv2 >= 0.2.0 - EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkexiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) - if(_return_VALUE STREQUAL "0") - message(STATUS "Found libkexiv2 release >= 0.2.0") - set(KEXIV2_VERSION_GOOD_FOUND TRUE) - else(_return_VALUE STREQUAL "0") - message(STATUS "Found libkexiv2 release < 0.2.0, too old") - set(KEXIV2_VERSION_GOOD_FOUND FALSE) - set(KEXIV2_FOUND FALSE) - endif(_return_VALUE STREQUAL "0") - else(_KEXIV2LinkFlags) - set(KEXIV2_VERSION_GOOD_FOUND FALSE) - set(KEXIV2_FOUND FALSE) - endif(_KEXIV2LinkFlags) +# - Try to find the Kexiv2 library using cmake pkg_check_modules + +if (KEXIV2_INCLUDEDIR AND KEXIV2_LIBRARIES) + # in cache already + SET(KEXIV2_FOUND TRUE) +else (KEXIV2_INCLUDEDIR AND KEXIV2_LIBRARIES) + if(NOT WIN32) + find_package(PkgConfig REQUIRED) + if (Kexiv2_FIND_REQUIRED) + pkg_check_modules(KEXIV2 REQUIRED libkexiv2>=0.2.0) + else (Kexiv2_FIND_REQUIRED) + pkg_check_modules(KEXIV2 libkexiv2>=0.2.0) + endif (Kexiv2_FIND_REQUIRED) else(NOT WIN32) - set(KEXIV2_VERSION_GOOD_FOUND TRUE) + set(KEXIV2_FOUND TRUE) endif(NOT WIN32) - - if(KEXIV2_VERSION_GOOD_FOUND) - set(KEXIV2_DEFINITIONS "${_KEXIV2Cflags}") - - FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h - ${_KEXIV2IncDir} - ) - - FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2 - PATHS - ${_KEXIV2LinkDir} - ) - - if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) - set(KEXIV2_FOUND TRUE) - endif (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) - endif(KEXIV2_VERSION_GOOD_FOUND) - if (KEXIV2_FOUND) - if (NOT Kexiv2_FIND_QUIETLY) - message(STATUS "Found libkexiv2: ${KEXIV2_LIBRARIES}") - endif (NOT Kexiv2_FIND_QUIETLY) - else (KEXIV2_FOUND) - if (Kexiv2_FIND_REQUIRED) - if (NOT KEXIV2_INCLUDE_DIR) - message(FATAL_ERROR "Could NOT find libkexiv2 header files") - endif (NOT KEXIV2_INCLUDE_DIR) - if (NOT KEXIV2_LIBRARIES) - message(FATAL_ERROR "Could NOT find libkexiv2 library") - endif (NOT KEXIV2_LIBRARIES) - endif (Kexiv2_FIND_REQUIRED) - endif (KEXIV2_FOUND) - - MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES) - - endif(KEXIV2_LOCAL_FOUND) - -endif (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) + if(KEXIV2_FOUND) + set(KEXIV2_DEFINITIONS ${KEXIV2_CFLAGS}) + if (NOT Kexiv2_FIND_QUIETLY) + message(STATUS "Found libkexiv2: ${KEXIV2_LIBRARIES}") + endif (NOT Kexiv2_FIND_QUIETLY) + endif (KEXIV2_FOUND) +endif (KEXIV2_INCLUDEDIR AND KEXIV2_LIBRARIES) -- cgit v1.2.1 From 044ccedb3df4f40ae1d8d7488d4dbc3b0c09484f Mon Sep 17 00:00:00 2001 From: Helio Castro Date: Tue, 11 Nov 2008 20:25:04 +0000 Subject: - Made changes requested by Alex svn path=/trunk/KDE/kdelibs/; revision=882988 --- modules/FindKexiv2.cmake | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) (limited to 'modules/FindKexiv2.cmake') diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake index f96631a7..739f187d 100644 --- a/modules/FindKexiv2.cmake +++ b/modules/FindKexiv2.cmake @@ -1,23 +1,41 @@ -# - Try to find the Kexiv2 library using cmake pkg_check_modules +# - Try to find the Kexiv2 library using cmake pkg_check_modulesi otherwise fallback to standard search +# Once done this will define: +# +# KEXIV2_FOUND - system has libkexiv2 +# KEXIV2_INCLUDEDIR - the libkexiv2 include directory +# KEXIV2_LIBRARIES - Link these to use libkexiv2 +# KEXIV2_DEFINITIONS - Compiler switches required for using libkexiv2 + if (KEXIV2_INCLUDEDIR AND KEXIV2_LIBRARIES) # in cache already SET(KEXIV2_FOUND TRUE) else (KEXIV2_INCLUDEDIR AND KEXIV2_LIBRARIES) if(NOT WIN32) - find_package(PkgConfig REQUIRED) - if (Kexiv2_FIND_REQUIRED) - pkg_check_modules(KEXIV2 REQUIRED libkexiv2>=0.2.0) - else (Kexiv2_FIND_REQUIRED) + find_package(PkgConfig) + if(PKG_CONFIG_EXECUTABLE) pkg_check_modules(KEXIV2 libkexiv2>=0.2.0) - endif (Kexiv2_FIND_REQUIRED) - else(NOT WIN32) - set(KEXIV2_FOUND TRUE) + endif(PKG_CONFIG_EXECUTABLE) endif(NOT WIN32) + + if(NOT KEXIV2_FOUND) + find_path(KEXIV2_INCLUDEDIR libkexiv2/version.h) + find_library(KEXIV2_LIBRARIES NAMES kexiv2) + if (KEXIV2_INCLUDEDIR AND KEXIV2_LIBRARIES) + set(KEXIV2_FOUND TRUE) + endif (KEXIV2_INCLUDEDIR AND KEXIV2_LIBRARIES) + endif(NOT KEXIV2_FOUND) + if(KEXIV2_FOUND) set(KEXIV2_DEFINITIONS ${KEXIV2_CFLAGS}) if (NOT Kexiv2_FIND_QUIETLY) message(STATUS "Found libkexiv2: ${KEXIV2_LIBRARIES}") endif (NOT Kexiv2_FIND_QUIETLY) + set(KEXIV2_INCLUDE_DIR ${KEXIV2_INCLUDEDIR}) + mark_as_advanced( KEXIV2_INCLUDE_DIR ) + else(KEXIV2_FOUND) + if (Kexiv2_FIND_REQUIRED) + message(FATAL_ERROR "Not found required libkexiv2") + endif (Kexiv2_FIND_REQUIRED) endif (KEXIV2_FOUND) endif (KEXIV2_INCLUDEDIR AND KEXIV2_LIBRARIES) -- 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/FindKexiv2.cmake | 124 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 93 insertions(+), 31 deletions(-) (limited to 'modules/FindKexiv2.cmake') diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake index 739f187d..c57ed1c2 100644 --- a/modules/FindKexiv2.cmake +++ b/modules/FindKexiv2.cmake @@ -1,41 +1,103 @@ -# - Try to find the Kexiv2 library using cmake pkg_check_modulesi otherwise fallback to standard search -# Once done this will define: +# - Try to find the KExiv2 library +# Once done this will define # # KEXIV2_FOUND - system has libkexiv2 -# KEXIV2_INCLUDEDIR - the libkexiv2 include directory +# KEXIV2_INCLUDE_DIR - the libkexiv2 include directory # KEXIV2_LIBRARIES - Link these to use libkexiv2 # KEXIV2_DEFINITIONS - Compiler switches required for using libkexiv2 +# + +if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) + + message(STATUS "Found Kexiv2 library in cache: ${KEXIV2_LIBRARIES}") + + # in cache already + SET(KEXIV2_FOUND TRUE) + +else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) + + message(STATUS "Check Kexiv2 library in local sub-folder...") + + # Check if library is not in local sub-folder + + FIND_FILE(KEXIV2_LOCAL_FOUND libkexiv2/version.h.cmake ${CMAKE_SOURCE_DIR}/libkexiv2 ${CMAKE_SOURCE_DIR}/libs/libkexiv2 NO_DEFAULT_PATH) + if (KEXIV2_LOCAL_FOUND) -if (KEXIV2_INCLUDEDIR AND KEXIV2_LIBRARIES) - # in cache already - SET(KEXIV2_FOUND TRUE) -else (KEXIV2_INCLUDEDIR AND KEXIV2_LIBRARIES) - if(NOT WIN32) - find_package(PkgConfig) - if(PKG_CONFIG_EXECUTABLE) - pkg_check_modules(KEXIV2 libkexiv2>=0.2.0) - endif(PKG_CONFIG_EXECUTABLE) + FIND_FILE(KEXIV2_LOCAL_FOUND_IN_LIBS libkexiv2/version.h.cmake ${CMAKE_SOURCE_DIR}/libs/libkexiv2 NO_DEFAULT_PATH) + if (KEXIV2_LOCAL_FOUND_IN_LIBS) + set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libs/libkexiv2) + else (KEXIV2_LOCAL_FOUND_IN_LIBS) + set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkexiv2) + endif (KEXIV2_LOCAL_FOUND_IN_LIBS) + set(KEXIV2_DEFINITIONS "-I${KEXIV2_INCLUDE_DIR}") + set(KEXIV2_LIBRARIES kexiv2) + message(STATUS "Found Kexiv2 library in local sub-folder: ${KEXIV2_INCLUDE_DIR}") + set(KEXIV2_FOUND TRUE) + MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES) + + else(KEXIV2_LOCAL_FOUND) + if(NOT WIN32) + message(STATUS "Check Kexiv2 library using pkg-config...") + + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + INCLUDE(UsePkgConfig) + + PKGCONFIG(libkexiv2 _KEXIV2IncDir _KEXIV2LinkDir _KEXIV2LinkFlags _KEXIV2Cflags) + + if(_KEXIV2LinkFlags) + # query pkg-config asking for a libkexiv2 >= 0.2.0 + EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkexiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) + if(_return_VALUE STREQUAL "0") + message(STATUS "Found libkexiv2 release >= 0.2.0") + set(KEXIV2_VERSION_GOOD_FOUND TRUE) + else(_return_VALUE STREQUAL "0") + message(STATUS "Found libkexiv2 release < 0.2.0, too old") + set(KEXIV2_VERSION_GOOD_FOUND FALSE) + set(KEXIV2_FOUND FALSE) + endif(_return_VALUE STREQUAL "0") + else(_KEXIV2LinkFlags) + set(KEXIV2_VERSION_GOOD_FOUND FALSE) + set(KEXIV2_FOUND FALSE) + endif(_KEXIV2LinkFlags) + else(NOT WIN32) + set(KEXIV2_VERSION_GOOD_FOUND TRUE) endif(NOT WIN32) - if(NOT KEXIV2_FOUND) - find_path(KEXIV2_INCLUDEDIR libkexiv2/version.h) - find_library(KEXIV2_LIBRARIES NAMES kexiv2) - if (KEXIV2_INCLUDEDIR AND KEXIV2_LIBRARIES) + if(KEXIV2_VERSION_GOOD_FOUND) + set(KEXIV2_DEFINITIONS "${_KEXIV2Cflags}") + + FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h + ${_KEXIV2IncDir} + ) + + FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2 + PATHS + ${_KEXIV2LinkDir} + ) + + if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) set(KEXIV2_FOUND TRUE) - endif (KEXIV2_INCLUDEDIR AND KEXIV2_LIBRARIES) - endif(NOT KEXIV2_FOUND) + endif (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) + endif(KEXIV2_VERSION_GOOD_FOUND) + if (KEXIV2_FOUND) + if (NOT Kexiv2_FIND_QUIETLY) + message(STATUS "Found libkexiv2: ${KEXIV2_LIBRARIES}") + endif (NOT Kexiv2_FIND_QUIETLY) + else (KEXIV2_FOUND) + if (Kexiv2_FIND_REQUIRED) + if (NOT KEXIV2_INCLUDE_DIR) + message(FATAL_ERROR "Could NOT find libkexiv2 header files") + endif (NOT KEXIV2_INCLUDE_DIR) + if (NOT KEXIV2_LIBRARIES) + message(FATAL_ERROR "Could NOT find libkexiv2 library") + endif (NOT KEXIV2_LIBRARIES) + endif (Kexiv2_FIND_REQUIRED) + endif (KEXIV2_FOUND) - if(KEXIV2_FOUND) - set(KEXIV2_DEFINITIONS ${KEXIV2_CFLAGS}) - if (NOT Kexiv2_FIND_QUIETLY) - message(STATUS "Found libkexiv2: ${KEXIV2_LIBRARIES}") - endif (NOT Kexiv2_FIND_QUIETLY) - set(KEXIV2_INCLUDE_DIR ${KEXIV2_INCLUDEDIR}) - mark_as_advanced( KEXIV2_INCLUDE_DIR ) - else(KEXIV2_FOUND) - if (Kexiv2_FIND_REQUIRED) - message(FATAL_ERROR "Not found required libkexiv2") - endif (Kexiv2_FIND_REQUIRED) - endif (KEXIV2_FOUND) -endif (KEXIV2_INCLUDEDIR AND KEXIV2_LIBRARIES) + MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES) + + endif(KEXIV2_LOCAL_FOUND) + +endif (KEXIV2_INCLUDE_DIR AND KEXIV2_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/FindKexiv2.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'modules/FindKexiv2.cmake') diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake index c57ed1c2..dd62e885 100644 --- a/modules/FindKexiv2.cmake +++ b/modules/FindKexiv2.cmake @@ -7,6 +7,11 @@ # KEXIV2_DEFINITIONS - Compiler switches required for using libkexiv2 # +# 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 (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) message(STATUS "Found Kexiv2 library in cache: ${KEXIV2_LIBRARIES}") -- cgit v1.2.1 From ee5546713bb2999bdf7a992b8052414124fd7286 Mon Sep 17 00:00:00 2001 From: Gilles Caulier Date: Mon, 3 Jan 2011 12:18:33 +0000 Subject: support local dir for digiKam 2.0.0 svn path=/trunk/KDE/kdelibs/; revision=1211248 --- modules/FindKexiv2.cmake | 55 ++++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 20 deletions(-) (limited to 'modules/FindKexiv2.cmake') diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake index dd62e885..4487537c 100644 --- a/modules/FindKexiv2.cmake +++ b/modules/FindKexiv2.cmake @@ -1,4 +1,8 @@ # - Try to find the KExiv2 library +# +# If you have put a local version of libkexiv2 into your source tree, +# set KEXIV2_LOCAL_DIR to the relative path to the local directory. +# # Once done this will define # # KEXIV2_FOUND - system has libkexiv2 @@ -12,34 +16,45 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) +if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES AND KEXIV2_DEFINITIONS) message(STATUS "Found Kexiv2 library in cache: ${KEXIV2_LIBRARIES}") # in cache already - SET(KEXIV2_FOUND TRUE) + set(KEXIV2_FOUND TRUE) -else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) +else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES AND KEXIV2_DEFINITIONS) message(STATUS "Check Kexiv2 library in local sub-folder...") # Check if library is not in local sub-folder - FIND_FILE(KEXIV2_LOCAL_FOUND libkexiv2/version.h.cmake ${CMAKE_SOURCE_DIR}/libkexiv2 ${CMAKE_SOURCE_DIR}/libs/libkexiv2 NO_DEFAULT_PATH) + if (KEXIV2_LOCAL_DIR) + set(KEXIV2_LOCAL_FOUND TRUE) + else (KEXIV2_LOCAL_DIR) + find_file(KEXIV2_LOCAL_FOUND libkexiv2/version.h.cmake ${CMAKE_SOURCE_DIR}/libkexiv2 ${CMAKE_SOURCE_DIR}/libs/libkexiv2 NO_DEFAULT_PATH) - if (KEXIV2_LOCAL_FOUND) + if (KEXIV2_LOCAL_FOUND) + # Was it found in libkexiv2/ or in libs/libkexiv2? + find_file(KEXIV2_LOCAL_FOUND_IN_LIBS libkexiv2/version.h.cmake ${CMAKE_SOURCE_DIR}/libs/libkexiv2 NO_DEFAULT_PATH) + if (KEXIV2_LOCAL_FOUND_IN_LIBS) + set(KEXIV2_LOCAL_DIR libs/libkexiv2) + else (KEXIV2_LOCAL_FOUND_IN_LIBS) + set(KEXIV2_LOCAL_DIR libkexiv2) + endif (KEXIV2_LOCAL_FOUND_IN_LIBS) + endif (KEXIV2_LOCAL_FOUND) - FIND_FILE(KEXIV2_LOCAL_FOUND_IN_LIBS libkexiv2/version.h.cmake ${CMAKE_SOURCE_DIR}/libs/libkexiv2 NO_DEFAULT_PATH) - if (KEXIV2_LOCAL_FOUND_IN_LIBS) - set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libs/libkexiv2) - else (KEXIV2_LOCAL_FOUND_IN_LIBS) - set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libkexiv2) - endif (KEXIV2_LOCAL_FOUND_IN_LIBS) - set(KEXIV2_DEFINITIONS "-I${KEXIV2_INCLUDE_DIR}") + endif (KEXIV2_LOCAL_DIR) + + if (KEXIV2_LOCAL_FOUND) + # we need two include directories: because the version.h file is put into the build directory + # TODO KEXIV2_INCLUDE_DIR sounds like it should contain only one directory... + set(KEXIV2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/${KEXIV2_LOCAL_DIR} ${CMAKE_BINARY_DIR}/${KEXIV2_LOCAL_DIR}) + set(KEXIV2_DEFINITIONS "-I${CMAKE_SOURCE_DIR}/${KEXIV2_LOCAL_DIR}" "-I${CMAKE_BINARY_DIR}/${KEXIV2_LOCAL_DIR}") set(KEXIV2_LIBRARIES kexiv2) - message(STATUS "Found Kexiv2 library in local sub-folder: ${KEXIV2_INCLUDE_DIR}") + message(STATUS "Found Kexiv2 library in local sub-folder: ${CMAKE_SOURCE_DIR}/${KEXIV2_LOCAL_DIR}") set(KEXIV2_FOUND TRUE) - MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES) + mark_as_advanced(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES KEXIV2_DEFINITIONS) else(KEXIV2_LOCAL_FOUND) if(NOT WIN32) @@ -47,13 +62,13 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) + include(UsePkgConfig) PKGCONFIG(libkexiv2 _KEXIV2IncDir _KEXIV2LinkDir _KEXIV2LinkFlags _KEXIV2Cflags) if(_KEXIV2LinkFlags) # query pkg-config asking for a libkexiv2 >= 0.2.0 - EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkexiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) + exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkexiv2 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) if(_return_VALUE STREQUAL "0") message(STATUS "Found libkexiv2 release >= 0.2.0") set(KEXIV2_VERSION_GOOD_FOUND TRUE) @@ -73,11 +88,11 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) if(KEXIV2_VERSION_GOOD_FOUND) set(KEXIV2_DEFINITIONS "${_KEXIV2Cflags}") - FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h + find_path(KEXIV2_INCLUDE_DIR libkexiv2/version.h ${_KEXIV2IncDir} ) - FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2 + find_library(KEXIV2_LIBRARIES NAMES kexiv2 PATHS ${_KEXIV2LinkDir} ) @@ -101,8 +116,8 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) endif (Kexiv2_FIND_REQUIRED) endif (KEXIV2_FOUND) - MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES) + mark_as_advanced(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES KEXIV2_DEFINITIONS) endif(KEXIV2_LOCAL_FOUND) -endif (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES) +endif (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES AND KEXIV2_DEFINITIONS) -- cgit v1.2.1