lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed the installation of pkg-config files

Browse source 
* Removed duplicated CMake code
* Made it possible to manually specify the pkg-config path
* Install pkg-config files by default on Linux and BSD systems
This commit is contained in:
Lukas Dürrenberger 2018-08-09 22:20:35 +02:00
parent 0423bc4013
commit 37aee610c8
2 changed files with 17 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cmake/Config.cmake
View file

@ -69,17 +69,12 @@ else()
return()
endif()
# check if OS or package system supports pkg-config
# set pkgconfig install directory
# this could be e.g. macports on mac or msys2 on windows etc.
find_package(PkgConfig QUIET)
if(PKG_CONFIG_EXECUTABLE)
if(EXISTS "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
set(SFML_OS_SUPPORTS_PKGCONFIG ON)
set(SFML_OS_PKGCONFIG_DIR "/lib${LIB_SUFFIX}/pkgconfig")
elseif(EXISTS "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig")
set(SFML_OS_SUPPORTS_PKGCONFIG ON)
set(SFML_OS_PKGCONFIG_DIR "/libdata/pkgconfig")
endif()
set(SFML_PKGCONFIG_DIR "/lib${LIB_SUFFIX}/pkgconfig")
if(SFML_OS_FREEBSD OR SFML_OS_OPENBSD)
set(SFML_PKGCONFIG_DIR "/libdata/pkgconfig")
endif()
# detect the compiler and its version