diff --git a/cmake/modules/FindIMLIB.cmake b/cmake/modules/FindIMLIB.cmake index 4a18bca65..fd7ddd46b 100644 --- a/cmake/modules/FindIMLIB.cmake +++ b/cmake/modules/FindIMLIB.cmake @@ -21,6 +21,7 @@ IF (DEFINED CACHED_IMLIB) ELSE (DEFINED CACHED_IMLIB) +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) @@ -28,7 +29,8 @@ ELSE (DEFINED CACHED_IMLIB) PKGCONFIG(imlib _IMLIBIncDir _IMLIBLinkDir _IMLIBLinkFlags _IMLIBCflags) set(IMLIB_DEFINITIONS ${_IMLIBCflags}) - +ENDIF (NOT WIN32) + FIND_PATH(IMLIB_INCLUDE_DIR Imlib.h ${_IMLIBIncDir} /usr/include diff --git a/cmake/modules/FindPopplerQt4.cmake b/cmake/modules/FindPopplerQt4.cmake index e21afa6e1..2400bc826 100644 --- a/cmake/modules/FindPopplerQt4.cmake +++ b/cmake/modules/FindPopplerQt4.cmake @@ -15,12 +15,13 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. +IF (NOT WIN32) + INCLUDE(UsePkgConfig) -INCLUDE(UsePkgConfig) + PKGCONFIG(poppler-qt4 _PopplerQt4IncDir _PopplerQt4LinkDir _PopplerQt4LinkFlags _PopplerQt4Cflags) -PKGCONFIG(poppler-qt4 _PopplerQt4IncDir _PopplerQt4LinkDir _PopplerQt4LinkFlags _PopplerQt4Cflags) - -set(POPPLER_QT4_DEFINITIONS ${_PopplerQt4Cflags}) + set(POPPLER_QT4_DEFINITIONS ${_PopplerQt4Cflags}) +ENDIF(NOT WIN32) FIND_PATH(POPPLER_QT4_INCLUDE_DIR poppler-qt4.h ${_PopplerQt4IncDir}/poppler