upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-17 03:38:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use import target for fontconfig.

Browse Source
This commit is contained in:
Pentarctagon 2021-12-15 01:49:52 -06:00 committed by Pentarctagon
parent 4574899436
commit df2803fd43
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -1,5 +1,5 @@
# set minimum version
cmake_minimum_required(VERSION 3.7)
cmake_minimum_required(VERSION 3.14)
project(wesnoth)
@ -473,10 +473,9 @@ if(ENABLE_GAME OR ENABLE_TESTS)
find_package(SDL2_mixer 2.0.0 REQUIRED)
find_package(VorbisFile REQUIRED)
find_package(PkgConfig REQUIRED)
find_package(Fontconfig REQUIRED)
pkg_check_modules(CAIRO REQUIRED cairo>=1.10)
pkg_check_modules(PANGOCAIRO REQUIRED pangocairo>=1.22.0)
# TODO: can use find_package and Fontconfig::Fontconfig with cmake 3.14+
pkg_check_modules(FONTCONFIG REQUIRED fontconfig>=2.4.1)
endif()
if(ENABLE_TESTS)

5
src/CMakeLists.txt
View File

@ -13,7 +13,6 @@ if(ENABLE_MYSQL)
endif()
## some includes ##
include_directories(SYSTEM ${FONTCONFIG_INCLUDE_DIRS})
include_directories(SYSTEM ${PANGOCAIRO_INCLUDE_DIRS})
include_directories(SYSTEM ${GETTEXT_INCLUDE_DIR})
include_directories(SYSTEM ${LIBDBUS_INCLUDE_DIRS})
@ -33,7 +32,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
link_directories(
${PANGOCAIRO_LIBRARY_DIRS}
${FONTCONFIG_LIBRARY_DIRS}
${LIBDBUS_LIBRARY_DIRS}
)
@ -56,7 +54,6 @@ set(game-external-libs
${SDL2_IMAGE_LIBRARY}
${SDL2_MIXER_LIBRARY}
${PANGOCAIRO_LIBRARIES}
${FONTCONFIG_LIBRARIES}
${LIBDBUS_LIBRARIES}
${VORBISFILE_LIBRARIES}
)
@ -185,6 +182,7 @@ if(ENABLE_GAME)
Boost::coroutine
Boost::locale
Boost::filesystem
Fontconfig::Fontconfig
)
if(ENABLE_DISPLAY_REVISION)
add_dependencies(wesnoth wesnoth-revision)
@ -225,6 +223,7 @@ if(ENABLE_TESTS)
Boost::locale
Boost::filesystem
Boost::unit_test_framework
Fontconfig::Fontconfig
)
if(ENABLE_DISPLAY_REVISION)
add_dependencies(boost_unit_tests wesnoth-revision)