diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindKdcraw.cmake | 34 | ||||
| -rw-r--r-- | modules/FindKexiv2.cmake | 34 | ||||
| -rw-r--r-- | modules/FindKipi.cmake | 35 | 
3 files changed, 78 insertions, 25 deletions
| diff --git a/modules/FindKdcraw.cmake b/modules/FindKdcraw.cmake index 4e265ce6..5527a5f4 100644 --- a/modules/FindKdcraw.cmake +++ b/modules/FindKdcraw.cmake @@ -1,23 +1,41 @@ -# - Try to find the Kdcraw library using cmake pkg_check_modules +# - Try to find the Kdcraw library using cmake pkg_check_modulesi otherwise fallback to standard search +# Once done this will define: +# +#  KDCRAW_FOUND - system has libkdcraw +#  KDCRAW_INCLUDEDIR - the libkdcraw include directory +#  KDCRAW_LIBRARIES - Link these to use libkdcraw +#  KDCRAW_DEFINITIONS - Compiler switches required for using libkdcraw +  if (KDCRAW_INCLUDEDIR AND KDCRAW_LIBRARIES)      # in cache already      SET(KDCRAW_FOUND TRUE)  else (KDCRAW_INCLUDEDIR AND KDCRAW_LIBRARIES)      if(NOT WIN32) -        find_package(PkgConfig REQUIRED) -        if (Kdcraw_FIND_REQUIRED) -            pkg_check_modules(KDCRAW REQUIRED libkdcraw>=0.2.0) -        else (Kdcraw_FIND_REQUIRED) +        find_package(PkgConfig) +        if(PKG_CONFIG_EXECUTABLE)              pkg_check_modules(KDCRAW libkdcraw>=0.2.0) -        endif (Kdcraw_FIND_REQUIRED) -    else(NOT WIN32) -        set(KDCRAW_FOUND TRUE) +        endif(PKG_CONFIG_EXECUTABLE)      endif(NOT WIN32) + +    if(NOT KDCRAW_FOUND) +        find_path(KDCRAW_INCLUDEDIR libkdcraw/version.h) +        find_library(KDCRAW_LIBRARIES NAMES kdcraw) +        if (KDCRAW_INCLUDEDIR AND KDCRAW_LIBRARIES) +            set(KDCRAW_FOUND TRUE) +        endif (KDCRAW_INCLUDEDIR AND KDCRAW_LIBRARIES) +    endif(NOT KDCRAW_FOUND) +          if(KDCRAW_FOUND)          set(KDCRAW_DEFINITIONS ${KDCRAW_CFLAGS})          if (NOT Kdcraw_FIND_QUIETLY)              message(STATUS "Found libkdcraw: ${KDCRAW_LIBRARIES}")          endif (NOT Kdcraw_FIND_QUIETLY) +        set(KDCRAW_INCLUDE_DIR ${KDCRAW_INCLUDEDIR}) +        mark_as_advanced( KDCRAW_INCLUDE_DIR ) +    else(KDCRAW_FOUND) +        if (Kdcraw_FIND_REQUIRED) +            message(FATAL_ERROR "Not found required libkdcraw") +        endif (Kdcraw_FIND_REQUIRED)      endif (KDCRAW_FOUND)  endif (KDCRAW_INCLUDEDIR AND KDCRAW_LIBRARIES) 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) diff --git a/modules/FindKipi.cmake b/modules/FindKipi.cmake index 83463fb7..0c6c33d7 100644 --- a/modules/FindKipi.cmake +++ b/modules/FindKipi.cmake @@ -1,24 +1,41 @@ -# - Try to find the Kipi library using cmake pkg_check_modules -# Once done this will define +# - Try to find the Kipi library using cmake pkg_check_modulesi otherwise fallback to standard search +# Once done this will define: +# +#  KIPI_FOUND - system has libkipi +#  KIPI_INCLUDEDIR - the libkipi include directory +#  KIPI_LIBRARIES - Link these to use libkipi +#  KIPI_DEFINITIONS - Compiler switches required for using libkipi +  if (KIPI_INCLUDEDIR AND KIPI_LIBRARIES)      # in cache already      SET(KIPI_FOUND TRUE)  else (KIPI_INCLUDEDIR AND KIPI_LIBRARIES)      if(NOT WIN32) -        find_package(PkgConfig REQUIRED) -        if (Kipi_FIND_REQUIRED) -            pkg_check_modules(KIPI REQUIRED libkipi>=0.2.0) -        else (Kipi_FIND_REQUIRED) +        find_package(PkgConfig) +        if(PKG_CONFIG_EXECUTABLE)              pkg_check_modules(KIPI libkipi>=0.2.0) -        endif (Kipi_FIND_REQUIRED) -    else(NOT WIN32) -        set(KIPI_FOUND TRUE) +        endif(PKG_CONFIG_EXECUTABLE)      endif(NOT WIN32) + +    if(NOT KIPI_FOUND) +        find_path(KIPI_INCLUDEDIR libkipi/version.h) +        find_library(KIPI_LIBRARIES NAMES kipi) +        if (KIPI_INCLUDEDIR AND KIPI_LIBRARIES) +            set(KIPI_FOUND TRUE) +        endif (KIPI_INCLUDEDIR AND KIPI_LIBRARIES) +    endif(NOT KIPI_FOUND) +          if(KIPI_FOUND)          set(KIPI_DEFINITIONS ${KIPI_CFLAGS})          if (NOT Kipi_FIND_QUIETLY)              message(STATUS "Found libkipi: ${KIPI_LIBRARIES}")          endif (NOT Kipi_FIND_QUIETLY) +        set(KIPI_INCLUDE_DIR ${KIPI_INCLUDEDIR}) +        mark_as_advanced( KIPI_INCLUDE_DIR ) +    else(KIPI_FOUND) +        if (Kipi_FIND_REQUIRED) +            message(FATAL_ERROR "Not found required libkipi") +        endif (Kipi_FIND_REQUIRED)      endif (KIPI_FOUND)  endif (KIPI_INCLUDEDIR AND KIPI_LIBRARIES) | 
