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

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

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

Modified Files:
	FindLibWpd.cmake FindLibWpg.cmake 
Log Message:
Branching off the stable branch STABLE-0-1-0 and porting perfectspot to the recent libwpg changes

Index: FindLibWpg.cmake
===================================================================
RCS file: /cvsroot/libwpg/perfectspot/cmake/FindLibWpg.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FindLibWpg.cmake	1 Jun 2007 21:18:32 -0000	1.3
+++ FindLibWpg.cmake	28 Nov 2008 15:09:15 -0000	1.4
@@ -16,22 +16,17 @@
 
 IF (NOT WIN32)
    INCLUDE(UsePkgConfig)
-   PKGCONFIG(libwpg-0.1 _LibWpgIncDir _LibWpgLinkDir _LibWpgLinkFlags _LibWpgCflags)
+   PKGCONFIG(libwpg-0.2 _LibWpgIncDir _LibWpgLinkDir _LibWpgLinkFlags _LibWpgCflags)
    SET(LIBWPG_DEFINITIONS ${_LibWpgCflags})
 ENDIF (NOT WIN32)
 
-FIND_PATH(LIBWPG_INCLUDE_DIR libwpg-0.1/libwpg/libwpg.h
+FIND_PATH(LIBWPG_INCLUDE_DIR libwpg-0.2/libwpg/libwpg.h
    PATHS
    ${_LibWpgIncDir}
    PATH_SUFFIXES libwpg
    )
 
-FIND_LIBRARY(LIBWPG_LIBRARIES NAMES wpg-0.1 libwpg-0.1
-   PATHS
-   ${_LibWpgLinkDir}
-   )
-
-FIND_LIBRARY(LIBWPG_STREAM_LIBRARIES NAMES wpg-stream-0.1 libwpg-stream-0.1
+FIND_LIBRARY(LIBWPG_LIBRARIES NAMES wpg-0.2 libwpg-0.2
    PATHS
    ${_LibWpgLinkDir}
    )
@@ -56,5 +51,4 @@
 MESSAGE("libwpg include dir " ${LIBWPG_INCLUDE_DIR})
 MESSAGE("libwpg lib dir " ${_LibWpgLinkDir})
 MESSAGE("libwpg library " ${LIBWPG_LIBRARIES})
-MESSAGE("libwpg stream library " ${LIBWPG_STREAM_LIBRARIES})
 MESSAGE("libwpg cflags " ${LIBWPG_DEFINITIONS})

Index: FindLibWpd.cmake
===================================================================
RCS file: /cvsroot/libwpg/perfectspot/cmake/FindLibWpd.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FindLibWpd.cmake	1 Jun 2007 21:18:32 -0000	1.2
+++ FindLibWpd.cmake	28 Nov 2008 15:09:15 -0000	1.3
@@ -15,32 +15,44 @@
 
 IF (NOT WIN32)
    INCLUDE(UsePkgConfig)
-   PKGCONFIG(libwpd-0.8 _LibWpdIncDir _LibWpdLinkDir _LibWpdLinkFlags _LibWpdCflags)
+   PKGCONFIG(libwpd-0.9 _LibWpdIncDir _LibWpdLinkDir _LibWpdLinkFlags _LibWpdCflags)
    SET(LIBWPD_DEFINITIONS ${_LibWpdCflags})
 ENDIF (NOT WIN32)
 
-FIND_PATH(LIBWPD_INCLUDE_DIR libwpd-0.8/libwpd/WPXStream.h
+FIND_PATH(LIBWPD_INCLUDE_DIR libwpd-0.9/libwpd/libwpd.h
    PATHS
    ${_LibWpdIncDir}
    PATH_SUFFIXES libwpd
    )
 
-IF (LIBWPD_INCLUDE_DIR)
+FIND_LIBRARY(LIBWPD_LIBRARIES NAMES wpd-0.9 libwpd-0.9
+   PATHS
+   ${_LibWpdLinkDir}
+   )
+
+FIND_LIBRARY(LIBWPD_STREAM_LIBRARIES NAMES wpd-stream-0.9 libwpd-stream-0.9
+   PATHS
+   ${_LibWPDLinkDir}
+   )
+
+IF (LIBWPD_INCLUDE_DIR AND LIBWPD_LIBRARIES AND LIBWPD_STREAM_LIBRARIES)
    SET(LIBWPD_FOUND TRUE)
-ELSE (LIBWPD_INCLUDE_DIR)
+ELSE (LIBWPD_INCLUDE_DIR AND LIBWPD_LIBRARIES AND LIBWPD_STREAM_LIBRARIES)
    SET(LIBWPD_FOUND FALSE)
-ENDIF (LIBWPD_INCLUDE_DIR)
+ENDIF (LIBWPD_INCLUDE_DIR AND LIBWPD_LIBRARIES AND LIBWPD_STREAM_LIBRARIES)
 
 IF (LIBWPD_FOUND)
    IF (NOT LibWpd_FIND_QUIETLY)
-      MESSAGE(STATUS "Found libwpd headers: ${LIBWPD_INCLUDE_DIR}")
+      MESSAGE(STATUS "Found libwpd: ${LIBWPD_LIBRARIES} ${LIBWPD_STREAM_LIBRARIES}")
    ENDIF (NOT LibWpd_FIND_QUIETLY)
 ELSE (LIBWPD_FOUND)
    IF (LibWpd_FIND_REQUIRED)
-      MESSAGE(SEND_ERROR "Could NOT find libwpd headers")
+      MESSAGE(SEND_ERROR "Could NOT find libwpd")
    ENDIF (LibWpd_FIND_REQUIRED)
 ENDIF (LIBWPD_FOUND)
 
-MESSAGE("libwpd headers found " ${LIBWPD_FOUND})
+MESSAGE("libwpd found " ${LIBWPD_FOUND})
 MESSAGE("libwpd include dir " ${LIBWPD_INCLUDE_DIR})
+MESSAGE("libwpd lib dir " ${_LibWpdLinkDir})
+MESSAGE("libwpd library " ${LIBWPD_LIBRARIES})
 MESSAGE("libwpd cflags " ${LIBWPD_DEFINITIONS})