[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/cmake/modules
From:       Laurent Montel <montel () kde ! org>
Date:       2007-08-20 11:14:45
Message-ID: 1187608485.426280.24969.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 702301 by mlaurent:

Fix on win32


 M  +6 -6      FindExif.cmake  
 M  +6 -5      FindGraphicsMagick.cmake  


--- trunk/koffice/cmake/modules/FindExif.cmake #702300:702301
@@ -7,19 +7,19 @@
 #
 
 
-# use pkg-config to get the directories and then use these values
-# in the FIND_PATH() and FIND_LIBRARY() calls
-INCLUDE(UsePkgConfig)
-
 if(LIBEXIF_INCLUDE_DIR AND LIBEXIF_LIBRARY)
 
   # Already in cache
   set(LIBEXIF_FOUND TRUE)
 
 else(LIBEXIF_INCLUDE_DIR AND LIBEXIF_LIBRARY)
+  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(libexif _LibexifIncDir _LibexifLinkDir _LibexifLinkFlags \
_LibexifCflags) +   endif(NOT WIN32)
 
-  PKGCONFIG(libexif _LibexifIncDir _LibexifLinkDir _LibexifLinkFlags _LibexifCflags)
-
   if(_LibexifLinkFlags)
     # query pkg-config asking for a libexif >= 0.6.12
     EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.6.12 libexif \
                RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
--- trunk/koffice/cmake/modules/FindGraphicsMagick.cmake #702300:702301
@@ -12,12 +12,13 @@
 
 SET(HAVE_GMAGICK 0)
 set(GRAPHICSMAGICK_FOUND FALSE)
+   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(GraphicsMagick _libMagickIncDir _libMagickLinkDir _libMagickLinkFlags \
_libMagickCflags) +   endif(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(GraphicsMagick _libMagickIncDir _libMagickLinkDir _libMagickLinkFlags \
                _libMagickCflags)
-
    set(GRAPHICSMAGICK_COMPILE_FLAGS ${_libMagickCflags})
    set(GRAPHICSMAGICK_LIBRARIES ${_libMagickLinkFlags})
 


[prev in list] [next in list] [prev in thread] [next in thread]