From 58a376c46e496cf3c57d82a45a998fc19b05b06b Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 13 Jun 2007 19:09:44 +0000 Subject: don't try to use pkgconfig under Windows Minor fix svn path=/trunk/KDE/kdelibs/; revision=675150 --- modules/FindGLIB2.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'modules') diff --git a/modules/FindGLIB2.cmake b/modules/FindGLIB2.cmake index 749dd671..5edbd7a4 100644 --- a/modules/FindGLIB2.cmake +++ b/modules/FindGLIB2.cmake @@ -9,9 +9,10 @@ if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) # Already in cache, be silent set(GLIB2_FIND_QUIETLY TRUE) endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) - -INCLUDE(UsePkgConfig) -PKGCONFIG(glib-2.0 _LibGLIB2IncDir _LibGLIB2LinkDir _LibGLIB2LinkFlags _LibGLIB2Cflags) +IF (NOT WIN32) + INCLUDE(UsePkgConfig) + PKGCONFIG(glib-2.0 _LibGLIB2IncDir _LibGLIB2LinkDir _LibGLIB2LinkFlags _LibGLIB2Cflags) +endif(NOT WIN32) FIND_PATH(GLIB2_INCLUDE_DIR glib.h ${_LibGLIB2IncDir} @@ -37,6 +38,10 @@ if(GLIB2_FOUND) if(NOT GLIB2_FIND_QUIETLY) message(STATUS "Found glib2: ${GLIB2_LIBRARIES} ${GLIB2_LIBRARIES}") endif(NOT GLIB2_FIND_QUIETLY) +else(GLIB2_FOUND) + if (GLIB2_FIND_REQUIRED) + message(FATAL_ERROR "Could NOT find glib2 library") + endif (GLIB2_FIND_REQUIRED) endif(GLIB2_FOUND) MARK_AS_ADVANCED(GLIB2_INCLUDE_DIR GLIB2_LIBRARIES) -- cgit v1.2.1