aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Montel <montel@kde.org>2006-11-20 09:34:10 +0000
committerLaurent Montel <montel@kde.org>2006-11-20 09:34:10 +0000
commit491b73d5a0712517b0be22ef7657b91a078ec08c (patch)
tree10652585a7d25b587fe0bc53459886fc76d2d961
parent686e98c28b13088f1a86fa3b1c910d1037122cbb (diff)
downloadextra-cmake-modules-491b73d5a0712517b0be22ef7657b91a078ec08c.tar.gz
extra-cmake-modules-491b73d5a0712517b0be22ef7657b91a078ec08c.tar.bz2
Don't try to use pkg-config under Windows
svn path=/trunk/KDE/kdelibs/; revision=606389
-rw-r--r--modules/FindAGG.cmake4
-rw-r--r--modules/FindENCHANT.cmake4
-rw-r--r--modules/FindFontconfig.cmake4
-rw-r--r--modules/FindOpenEXR.cmake4
-rw-r--r--modules/FindQCA2.cmake4
-rw-r--r--modules/FindUSB.cmake4
6 files changed, 12 insertions, 12 deletions
diff --git a/modules/FindAGG.cmake b/modules/FindAGG.cmake
index d4b6df27..178c772b 100644
--- a/modules/FindAGG.cmake
+++ b/modules/FindAGG.cmake
@@ -17,7 +17,7 @@ if (AGG_INCLUDE_DIR AND AGG_LIBRARIES)
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 @@ else (AGG_INCLUDE_DIR AND AGG_LIBRARIES)
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
diff --git a/modules/FindENCHANT.cmake b/modules/FindENCHANT.cmake
index 04ddb0fe..f7a3f0f6 100644
--- a/modules/FindENCHANT.cmake
+++ b/modules/FindENCHANT.cmake
@@ -18,7 +18,7 @@ if (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
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 @@ else (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
PKGCONFIG(enchant _ENCHANTIncDir _ENCHANTLinkDir _ENCHANTLinkFlags _ENCHANTCflags)
set(ENCHANT_DEFINITIONS ${_ENCHANTCflags})
-
+ENDIF (NOT WIN32)
FIND_PATH(ENCHANT_INCLUDE_DIR enchant/enchant.h
${_ENCHANTIncDir}
/usr/include
diff --git a/modules/FindFontconfig.cmake b/modules/FindFontconfig.cmake
index 3f588479..f90c3b32 100644
--- a/modules/FindFontconfig.cmake
+++ b/modules/FindFontconfig.cmake
@@ -17,7 +17,7 @@ if (FONTCONFIG_LIBRARIES AND FONTCONFIG_DEFINITIONS)
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 @@ else (FONTCONFIG_LIBRARIES AND FONTCONFIG_DEFINITIONS)
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}
diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake
index 81627b7e..36950b83 100644
--- a/modules/FindOpenEXR.cmake
+++ b/modules/FindOpenEXR.cmake
@@ -16,13 +16,13 @@ if (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES)
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/
diff --git a/modules/FindQCA2.cmake b/modules/FindQCA2.cmake
index c9ba1bf7..7dc12e35 100644
--- a/modules/FindQCA2.cmake
+++ b/modules/FindQCA2.cmake
@@ -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}
diff --git a/modules/FindUSB.cmake b/modules/FindUSB.cmake
index 5c4d65d6..e4ffbac5 100644
--- a/modules/FindUSB.cmake
+++ b/modules/FindUSB.cmake
@@ -17,13 +17,13 @@ if (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
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