speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
6
2
Fork 3
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

build: Fix a missing FreeSOLID includes error.

Browse source 
The <SOLID/solid.h> header would not be made available when using a
pkg-config discovered FreeSOLID library.

* cmake/FindSOLID.cmake: Add IMPORTED_TARGET argument to
'pkg_check_modules' calls.
[PKGCONFIG_FOUND && SOLID_FOUND]: Alias 'solid' to PkgConfig::SOLID.

Fixes: #45
This commit is contained in:
Maxim Cournoyer 2025-01-30 23:05:55 +09:00
parent c5b0a2b38a
commit c8269cf804
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmake/FindSOLID.cmake
View file

@ -20,9 +20,9 @@ ENDIF(SOLID_FOUND)
FIND_PACKAGE(PkgConfig) FIND_PACKAGE(PkgConfig)
IF(PKGCONFIG_FOUND) IF(PKGCONFIG_FOUND)
PKG_CHECK_MODULES(SOLID FreeSOLID) PKG_CHECK_MODULES(SOLID FreeSOLID IMPORTED_TARGET)
IF(NOT SOLID_FOUND) IF(NOT SOLID_FOUND)
PKG_CHECK_MODULES(SOLID SOLID) PKG_CHECK_MODULES(SOLID SOLID IMPORTED_TARGET)
ENDIF (NOT SOLID_FOUND) ENDIF (NOT SOLID_FOUND)
IF(SOLID_FOUND) IF(SOLID_FOUND)
@ -33,6 +33,7 @@ IF(PKGCONFIG_FOUND)
SET(SOLID_MOTO_LIBRARY "NOT-FOUND" CACHE STRING "MOTO libraries") SET(SOLID_MOTO_LIBRARY "NOT-FOUND" CACHE STRING "MOTO libraries")
SET(SOLID_LIBRARY ${SOLID_SOLID_LIBRARY}) SET(SOLID_LIBRARY ${SOLID_SOLID_LIBRARY})
MESSAGE(STATUS "Looking for SOLID --- found using pkg-config (${SOLID_SOLID_LIBRARY})") MESSAGE(STATUS "Looking for SOLID --- found using pkg-config (${SOLID_SOLID_LIBRARY})")
add_library(solid ALIAS PkgConfig::SOLID)
RETURN() RETURN()
ENDIF(SOLID_FOUND) ENDIF(SOLID_FOUND)