Explicitly link to GObject (should fix #3840)

wesnoth · Jan 5, 2019 · d664aaf · d664aaf
1 parent e88127a
commit d664aaf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -506,6 +506,7 @@ if(ENABLE_GAME OR ENABLE_TESTS)
 	find_package( SDL2_ttf 2.0.12 REQUIRED )
 	find_package(VorbisFile REQUIRED)
 	find_package( PkgConfig REQUIRED )
+	pkg_check_modules( GOBJECT REQUIRED gobject-2.0 )
 	pkg_check_modules( CAIRO REQUIRED cairo>=1.10 )
 	pkg_check_modules( PANGOCAIRO REQUIRED pangocairo>=1.22.0 )
 	pkg_check_modules( FONTCONFIG REQUIRED fontconfig>=2.4.1 )

diff --git a/SConstruct b/SConstruct
@@ -393,6 +393,7 @@ if env["prereqs"]:
         conf.CheckOgg())) & \
         conf.CheckPNG() & \
         conf.CheckJPG() & \
+        conf.CheckPKG("gobject-2.0") & \
         conf.CheckCairo(min_version = "1.10") & \
         conf.CheckPango("cairo", require_version = "1.22.0") & \
         conf.CheckPKG("fontconfig") & \

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -78,6 +78,7 @@ set(game-external-libs
 	${sdl_image-lib}
 	${sdl_mixer-lib}
 	${sdl_ttf-lib}
+	${GOBJECT_LIBRARIES}
 	${PANGOCAIRO_LIBRARIES}
 	${FONTCONFIG_LIBRARIES}
 	${LIBDBUS_LIBRARIES}