diff options
| -rw-r--r-- | modules/FindKdcraw.cmake | 21 | ||||
| -rw-r--r-- | modules/FindKexiv2.cmake | 23 | ||||
| -rw-r--r-- | modules/FindKipi.cmake | 21 |
3 files changed, 37 insertions, 28 deletions
diff --git a/modules/FindKdcraw.cmake b/modules/FindKdcraw.cmake index c6b10d43..8d06a858 100644 --- a/modules/FindKdcraw.cmake +++ b/modules/FindKdcraw.cmake @@ -34,14 +34,14 @@ else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES) else(KDCRAW_LOCAL_FOUND) message(STATUS "Check Kdcraw 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) + 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(libkdcraw _KDCRAWIncDir _KDCRAWLinkDir _KDCRAWLinkFlags _KDCRAWCflags) + PKGCONFIG(libkdcraw _KDCRAWIncDir _KDCRAWLinkDir _KDCRAWLinkFlags _KDCRAWCflags) - if(_KDCRAWLinkFlags) + if(_KDCRAWLinkFlags) # query pkg-config asking for a libkdcraw >= 0.2.0 EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkdcraw RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) if(_return_VALUE STREQUAL "0") @@ -50,12 +50,15 @@ else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES) else(_return_VALUE STREQUAL "0") message(FATAL_ERROR "Found libkdcaw release < 0.2.0") endif(_return_VALUE STREQUAL "0") - else(_KDCRAWLinkFlags) + else(_KDCRAWLinkFlags) set(KDCRAW_VERSION_GOOD_FOUND FALSE) set(KDCRAW_FOUND FALSE) message(FATAL_ERROR "Could NOT find libkdcraw library!") - endif(_KDCRAWLinkFlags) - + endif(_KDCRAWLinkFlags) + ELSE(NOT WIN32) + set(KDCRAW_VERSION_GOOD_FOUND TRUE) + ENDif(NOT WIN32) + if(KDCRAW_VERSION_GOOD_FOUND) set(KDCRAW_DEFINITIONS ${_KDCRAWCflags}) 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}) diff --git a/modules/FindKipi.cmake b/modules/FindKipi.cmake index da8902d6..e7027ef0 100644 --- a/modules/FindKipi.cmake +++ b/modules/FindKipi.cmake @@ -33,15 +33,16 @@ else (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES) else(KIPI_LOCAL_FOUND) - message(STATUS "Check Kipi library using pkg-config...") + if(NOT WIN32) + message(STATUS "Check Kipi 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(libkipi _KIPIIncDir _KIPILinkDir _KIPILinkFlags _KIPICflags) + PKGCONFIG(libkipi _KIPIIncDir _KIPILinkDir _KIPILinkFlags _KIPICflags) - if(_KIPILinkFlags) + if(_KIPILinkFlags) # query pkg-config asking for a libkipi >= 0.2.0 EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkipi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) if(_return_VALUE STREQUAL "0") @@ -50,12 +51,14 @@ else (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES) else(_return_VALUE STREQUAL "0") message(FATAL_ERROR "Found libkipi release < 0.2.0") endif(_return_VALUE STREQUAL "0") - else(_KIPILinkFlags) + else(_KIPILinkFlags) set(KIPI_VERSION_GOOD_FOUND FALSE) set(KIPI_FOUND FALSE) message(FATAL_ERROR "Could NOT find libkipi library!") - endif(_KIPILinkFlags) - + endif(_KIPILinkFlags) + else(NOT WIN32) + set(KIPI_VERSION_GOOD_FOUND TRUE) + endif(NOT WIN32) if(KIPI_VERSION_GOOD_FOUND) set(KIPI_DEFINITIONS ${_KIPICflags}) |