Update of /cvsroot/libwpg/perfectspot
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26584
Modified Files:
CMakeLists.txt
Log Message:
use a newer cmake macro for pkg-config stuff
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/libwpg/perfectspot/CMakeLists.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CMakeLists.txt 28 Nov 2008 15:09:15 -0000 1.4
+++ CMakeLists.txt 5 Dec 2008 18:44:55 -0000 1.5
@@ -6,11 +6,13 @@
set(CMAKE_COLOR_MAKEFILE ON)
set(CMAKE_VERBOSE_MAKEFILE OFF)
set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
-set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-include(FindLibWpd)
-include(FindLibWpg)
-include_directories(${LIBWPD_INCLUDE_DIR}/libwpd-0.9 ${LIBWPG_INCLUDE_DIR}/libwpg-0.2)
+INCLUDE(FindPkgConfig)
+pkg_check_modules(LIBWPG REQUIRED libwpg-0.2)
+pkg_check_modules(LIBWPD REQUIRED libwpd-0.9)
+pkg_check_modules(LIBWPD_STREAM REQUIRED libwpd-stream-0.9)
+
+include_directories(${LIBWPG_INCLUDE_DIRS} ${LIBWPD_INCLUDE_DIRS} ${LIBWPD_STREAM_INCLUDE_DIRS})
set(QT_MIN_VERSION "4.1.0")
find_package(Qt4 REQUIRED)
|
