rixty/bygfoot
1
1
Fork 0
mirror of https://github.com/tstellar/bygfoot.git synced 2025-03-12 16:50:15 +01:00
Code Issues Projects Releases Wiki Activity

cmake: Use find_package instead of pkg-config

Browse Source 
There was a change in the GitHub action Windows environment that caused
CMake to stop finding pkg-config.  So, using find_package instead of
pkg-config fixes the builds in that environment.  It also makes the
CMake configuration more consistent since we are already using
find_package for other libraries.
This commit is contained in:
Tom Stellard 2020-12-05 21:02:17 -08:00
parent 1ad0d534ca
commit d880736545
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/package.yml vendored
View File

@ -58,7 +58,7 @@ jobs:
run: | run: |
# Set PATH so CMake can find pkg-config # Set PATH so CMake can find pkg-config
export PATH=`pwd`/bin:$PATH export PATH=`pwd`/bin:$PATH
# export GTKMM_BASEPATH=`pwd` export GTKMM_BASEPATH=`pwd`
./scripts/package.sh . ./scripts/package.sh .
shell: bash shell: bash

19
CMakeLists.txt
View File

@ -1,17 +1,13 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR) cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
set(CMAKE_LEGACY_CYGWIN_WIN32 0) set(CMAKE_LEGACY_CYGWIN_WIN32 0)
# This is needed so that CMake will use the PkgConfig_ROOT environment variable which
# we need to set for Windows builds with GitHub Actions.
cmake_policy(SET CMP0074 NEW)
project("bygfoot") project("bygfoot")
find_package(PkgConfig REQUIRED) find_package(GTK2 REQUIRED)
pkg_check_modules(GLIB_PKG glib-2.0)
if (GLIB_PKG_FOUND)
message(Found glib-2.0)
# include_directories(${GLIB_PKG_INCLUDE_DIRS})
endif (GLIB_PKG_FOUND)
pkg_check_modules (GTK2 REQUIRED gtk+-2.0)
# Setup CMake to use GTK+, tell the compiler where to look for headers # Setup CMake to use GTK+, tell the compiler where to look for headers
# and to the linker where to look for libraries # and to the linker where to look for libraries
# Setup CMake to use GTK+, tell the compiler where to look for headers # Setup CMake to use GTK+, tell the compiler where to look for headers
@ -19,8 +15,9 @@ endif (GLIB_PKG_FOUND)
link_directories (${GTK2_LIBRARY_DIRS}) link_directories (${GTK2_LIBRARY_DIRS})
# Add other flags to the compiler # Add other flags to the compiler
add_definitions (${GTK2_CFLAGS_OTHER}) add_definitions (${GTK2_CFLAGS_OTHER})
pkg_check_modules (GETTEXT REQUIRED) find_package(Gettext REQUIRED)
add_definitions("-DGETTEXT_PACKAGE=\"${PROJECT_NAME}\"") add_definitions("-DGETTEXT_PACKAGE=\"${PROJECT_NAME}\"")
find_package(Intl REQUIRED)
find_package(ZLIB) find_package(ZLIB)
include(GNUInstallDirs) include(GNUInstallDirs)
add_definitions("-DPACKAGE_DATA_DIR=\"${CMAKE_INSTALL_FULL_DATADIR}\"") add_definitions("-DPACKAGE_DATA_DIR=\"${CMAKE_INSTALL_FULL_DATADIR}\"")
@ -33,7 +30,7 @@ add_executable(bygfoot src/bet.c src/bet.h src/finance.h src/fixture.h src/game_
target_compile_options(bygfoot PRIVATE -Wno-deprecated-declarations) target_compile_options(bygfoot PRIVATE -Wno-deprecated-declarations)
# Link the target to the GTK+ libraries # Link the target to the GTK+ libraries
target_link_libraries (bygfoot ${GTK2_LIBRARIES} ${GLIB_LIBRARIES} m target_link_libraries (bygfoot ${GTK2_LIBRARIES} ${GLIB_LIBRARIES} m
${ZLIB_LIBRARIES}) ${ZLIB_LIBRARIES} ${Intl_LIBRARIES})
install(TARGETS bygfoot) install(TARGETS bygfoot)