[Libwpg-cvs] perfectspot/cmake FindLibWpd.cmake, 1.3, 1.4 FindLibWpg.cmake, 1.4, 1.5

[Fridrich S. <str...@us...>]

Update of /cvsroot/libwpg/perfectspot/cmake
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6612/cmake

Modified Files:
	FindLibWpd.cmake FindLibWpg.cmake 
Log Message:
removing some warnings and making use of pkgconfig even on win32

Index: FindLibWpg.cmake
===================================================================
RCS file: /cvsroot/libwpg/perfectspot/cmake/FindLibWpg.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- FindLibWpg.cmake	28 Nov 2008 15:09:15 -0000	1.4
+++ FindLibWpg.cmake	1 Dec 2008 16:20:39 -0000	1.5
@@ -14,11 +14,11 @@
    SET(LibWpg_FIND_QUIETLY TRUE)
 ENDIF (LIBWPG_INCLUDE_DIR AND LIBWPG_LIBRARIES)
 
-IF (NOT WIN32)
+#IF (NOT WIN32)
    INCLUDE(UsePkgConfig)
    PKGCONFIG(libwpg-0.2 _LibWpgIncDir _LibWpgLinkDir _LibWpgLinkFlags _LibWpgCflags)
    SET(LIBWPG_DEFINITIONS ${_LibWpgCflags})
-ENDIF (NOT WIN32)
+#ENDIF (NOT WIN32)
 
 FIND_PATH(LIBWPG_INCLUDE_DIR libwpg-0.2/libwpg/libwpg.h
    PATHS

Index: FindLibWpd.cmake
===================================================================
RCS file: /cvsroot/libwpg/perfectspot/cmake/FindLibWpd.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FindLibWpd.cmake	28 Nov 2008 15:09:15 -0000	1.3
+++ FindLibWpd.cmake	1 Dec 2008 16:20:39 -0000	1.4
@@ -13,11 +13,11 @@
    SET(LibWpd_FIND_QUIETLY TRUE)
 ENDIF (LIBWPD_INCLUDE_DIR)
 
-IF (NOT WIN32)
+#IF (NOT WIN32)
    INCLUDE(UsePkgConfig)
    PKGCONFIG(libwpd-0.9 _LibWpdIncDir _LibWpdLinkDir _LibWpdLinkFlags _LibWpdCflags)
    SET(LIBWPD_DEFINITIONS ${_LibWpdCflags})
-ENDIF (NOT WIN32)
+#ENDIF (NOT WIN32)
 
 FIND_PATH(LIBWPD_INCLUDE_DIR libwpd-0.9/libwpd/libwpd.h
    PATHS
@@ -32,7 +32,7 @@
 
 FIND_LIBRARY(LIBWPD_STREAM_LIBRARIES NAMES wpd-stream-0.9 libwpd-stream-0.9
    PATHS
-   ${_LibWPDLinkDir}
+   ${_LibWpdLinkDir}
    )
 
 IF (LIBWPD_INCLUDE_DIR AND LIBWPD_LIBRARIES AND LIBWPD_STREAM_LIBRARIES)
@@ -55,4 +55,5 @@
 MESSAGE("libwpd include dir " ${LIBWPD_INCLUDE_DIR})
 MESSAGE("libwpd lib dir " ${_LibWpdLinkDir})
 MESSAGE("libwpd library " ${LIBWPD_LIBRARIES})
+MESSAGE("libwpd-stream library " ${LIBWPD_STREAM_LIBRARIES})
 MESSAGE("libwpd cflags " ${LIBWPD_DEFINITIONS})