Author: ivanovic
Date: Sun Jul 13 12:46:56 2008
New Revision: 27979
URL: http://svn.gna.org/viewcvs/wesnoth?rev=27979&view=rev
Log:
add (pkgconfig based) check for pangocairo
Modified:
trunk/CMakeLists.txt
trunk/src/CMakeLists.txt
Modified: trunk/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/CMakeLists.txt?rev=27979&r1=27978&r2=27979&view=diff
==============================================================================
--- trunk/CMakeLists.txt (original)
+++ trunk/CMakeLists.txt Sun Jul 13 12:46:56 2008
@@ -24,14 +24,18 @@
# use our own version of FindBoost.cmake and other Find* scripts
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-# find all deps needed
+# find all deps needed, pkgconfig is needed to find pangocairo
find_package( SDL 1.2.7 REQUIRED )
find_package( Boost 1.33 REQUIRED COMPONENTS iostreams regex )
+find_package( PkgConfig REQUIRED )
find_package( Gettext )
find_package( FriBiDi )
find_package( PythonInterp 2.4 )
find_package( PythonCustom )
find_package( X11 )
+
+#use pkg-config to find pangocairo:
+pkg_check_modules( PANGOCAIRO REQUIRED pangocairo>=1.14.8 )
#
# Options
Modified: trunk/src/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/CMakeLists.txt?rev=27979&r1=27978&r2=27979&view=diff
==============================================================================
--- trunk/src/CMakeLists.txt (original)
+++ trunk/src/CMakeLists.txt Sun Jul 13 12:46:56 2008
@@ -1,6 +1,7 @@
## some includes ##
include_directories( ${Boost_INCLUDE_DIR} )
include_directories( ${SDL_INCLUDE_DIR} )
+include_directories( ${PANGOCAIRO_INCLUDE_DIRS} )
#optional dependencies
if(SDLIMAGE_INCLUDE_DIR)
@@ -36,6 +37,7 @@
${SDLMIXER_LIBRARY}
${SDLNET_LIBRARY}
${SDLTTF_LIBRARY}
+ ${PANGOCAIRO_LDFLAGS}
)
set( server-external-libs
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
