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

List:       kde-commits
Subject:    KDE/kdelibs/cmake/modules
From:       Laurent Montel <montel () kde ! org>
Date:       2006-11-20 9:34:15
Message-ID: 1164015255.357426.29672.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 606389 by mlaurent:

Don't try to use pkg-config under Windows


 M  +2 -2      FindAGG.cmake  
 M  +2 -2      FindENCHANT.cmake  
 M  +2 -2      FindFontconfig.cmake  
 M  +2 -2      FindOpenEXR.cmake  
 M  +2 -2      FindQCA2.cmake  
 M  +2 -2      FindUSB.cmake  


--- trunk/KDE/kdelibs/cmake/modules/FindAGG.cmake #606388:606389
@@ -17,7 +17,7 @@
   SET(AGG_FOUND TRUE)
 
 else (AGG_INCLUDE_DIR AND AGG_LIBRARIES)
-
+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)
@@ -25,7 +25,7 @@
   PKGCONFIG(libagg _AGGIncDir _AGGLinkDir _AGGLinkFlags _AGGCflags)
   
   set(AGG_DEFINITIONS ${_AGGCflags})
-  
+ENDIF (NOT WIN32)  
   FIND_PATH(AGG_INCLUDE_DIR agg2/agg_pixfmt_gray.h
     ${_AGGIncDir}
     /usr/include
--- trunk/KDE/kdelibs/cmake/modules/FindENCHANT.cmake #606388:606389
@@ -18,7 +18,7 @@
   SET(ENCHANT_FOUND TRUE)
 
 else (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
-
+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)
@@ -26,7 +26,7 @@
   PKGCONFIG(enchant _ENCHANTIncDir _ENCHANTLinkDir _ENCHANTLinkFlags _ENCHANTCflags)
   
   set(ENCHANT_DEFINITIONS ${_ENCHANTCflags})
-  
+ENDIF (NOT WIN32)  
   FIND_PATH(ENCHANT_INCLUDE_DIR enchant/enchant.h
     ${_ENCHANTIncDir}
     /usr/include
--- trunk/KDE/kdelibs/cmake/modules/FindFontconfig.cmake #606388:606389
@@ -17,7 +17,7 @@
   set(FONTCONFIG_FOUND TRUE)
 
 else (FONTCONFIG_LIBRARIES AND FONTCONFIG_DEFINITIONS)
-
+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)
@@ -25,7 +25,7 @@
   PKGCONFIG(fontconfig _FONTCONFIGIncDir _FONTCONFIGLinkDir _FONTCONFIGLinkFlags _FONTCONFIGCflags)
 
   set(FONTCONFIG_DEFINITIONS ${_FONTCONFIGCflags} CACHE INTERNAL "The compilation flags for fontconfig")
-
+ENDIF (NOT WIN32)
   find_path(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h
     PATHS
     ${_FONTCONFIGIncDir}
--- trunk/KDE/kdelibs/cmake/modules/FindOpenEXR.cmake #606388:606389
@@ -16,13 +16,13 @@
   SET(OPENEXR_FOUND TRUE)
 
 else (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES)
-
+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(OpenEXR _OpenEXRIncDir _OpenEXRLinkDir _OpenEXRLinkFlags _OpenEXRCflags)
-  
+ENDIF (NOT WIN32)  
   FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h
      ${_OpenEXRIncDir}
      ${_OpenEXRIncDir}/OpenEXR/
--- trunk/KDE/kdelibs/cmake/modules/FindQCA2.cmake #606388:606389
@@ -17,14 +17,14 @@
 
 
 INCLUDE(UsePkgConfig)
-
+IF (NOT WIN32)
 PKGCONFIG(qca _Qca2IncDir _Qca2LinkDir _Qca2LinkFlags _Qca2Cflags)
 
 MESSAGE(STATUS "pkg-config returned ${_Qca2IncDir} for QCA 2 includes")
 set(QCA2_DEFINITIONS ${_Qca2Cflags})
 
 set(QCA2_INCLUDE_DIR ${_Qca2IncDir})
-
+ENDIF (NOT WIN32)
 #FIND_PATH(QCA2_INCLUDE_DIR QtCrypto
 #  PATHS
 # ${_Qca2IncDir}
--- trunk/KDE/kdelibs/cmake/modules/FindUSB.cmake #606388:606389
@@ -17,13 +17,13 @@
   set(LIBUSB_FOUND TRUE)
 
 else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
-
+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(libUSB _libUSBIncDir _libUSBLinkDir _libUSBLinkFlags _libUSBCflags)
-
+ENDIF(NOT WIN32)
   FIND_PATH(LIBUSB_INCLUDE_DIR usb.h
     /usr/include
     /usr/local/include
[prev in list] [next in list] [prev in thread] [next in thread]