mirror of
https://invent.kde.org/graphics/okular
synced 2024-08-27 19:50:27 +00:00
Don't try to use pkgconfig under windows
svn path=/trunk/KDE/kdegraphics/cmake/modules/; revision=605631
This commit is contained in:
parent
eba7da2a4a
commit
8fa5bcb761
|
@ -21,6 +21,7 @@ IF (DEFINED CACHED_IMLIB)
|
||||||
|
|
||||||
ELSE (DEFINED CACHED_IMLIB)
|
ELSE (DEFINED CACHED_IMLIB)
|
||||||
|
|
||||||
|
IF (NOT WIN32)
|
||||||
# use pkg-config to get the directories and then use these values
|
# use pkg-config to get the directories and then use these values
|
||||||
# in the FIND_PATH() and FIND_LIBRARY() calls
|
# in the FIND_PATH() and FIND_LIBRARY() calls
|
||||||
INCLUDE(UsePkgConfig)
|
INCLUDE(UsePkgConfig)
|
||||||
|
@ -28,7 +29,8 @@ ELSE (DEFINED CACHED_IMLIB)
|
||||||
PKGCONFIG(imlib _IMLIBIncDir _IMLIBLinkDir _IMLIBLinkFlags _IMLIBCflags)
|
PKGCONFIG(imlib _IMLIBIncDir _IMLIBLinkDir _IMLIBLinkFlags _IMLIBCflags)
|
||||||
|
|
||||||
set(IMLIB_DEFINITIONS ${_IMLIBCflags})
|
set(IMLIB_DEFINITIONS ${_IMLIBCflags})
|
||||||
|
ENDIF (NOT WIN32)
|
||||||
|
|
||||||
FIND_PATH(IMLIB_INCLUDE_DIR Imlib.h
|
FIND_PATH(IMLIB_INCLUDE_DIR Imlib.h
|
||||||
${_IMLIBIncDir}
|
${_IMLIBIncDir}
|
||||||
/usr/include
|
/usr/include
|
||||||
|
|
|
@ -15,12 +15,13 @@
|
||||||
# Redistribution and use is allowed according to the terms of the BSD license.
|
# Redistribution and use is allowed according to the terms of the BSD license.
|
||||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
# 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})
|
||||||
|
ENDIF(NOT WIN32)
|
||||||
set(POPPLER_QT4_DEFINITIONS ${_PopplerQt4Cflags})
|
|
||||||
|
|
||||||
FIND_PATH(POPPLER_QT4_INCLUDE_DIR poppler-qt4.h
|
FIND_PATH(POPPLER_QT4_INCLUDE_DIR poppler-qt4.h
|
||||||
${_PopplerQt4IncDir}/poppler
|
${_PopplerQt4IncDir}/poppler
|
||||||
|
|
Loading…
Reference in a new issue