dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build(cmake): fallback to pkg-config discovery for tomlplusplus

Browse source 
Some distributions of it (like in vcpkg *wink*) won't contain CMake files

Signed-off-by: seth <getchoo@tuta.io>
This commit is contained in:
seth 2025-05-05 11:54:20 -04:00 • committed by Seth Flynn
parent 822b10e46e
commit a5f5d14538
No known key found for this signature in database
GPG key ID: D31BD0D494BBEE86
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -348,6 +348,14 @@ endif()
if(NOT Launcher_FORCE_BUNDLED_LIBS) if(NOT Launcher_FORCE_BUNDLED_LIBS)
# Find toml++ # Find toml++
find_package(tomlplusplus 3.2.0 QUIET) find_package(tomlplusplus 3.2.0 QUIET)
# Fallback to pkg-config (if available) if CMake files aren't found
if(NOT tomlplusplus_FOUND)
find_package(PkgConfig)
if(PkgConfig_FOUND)
pkg_check_modules(tomlplusplus IMPORTED_TARGET tomlplusplus>=3.2.0)
endif()
endif()
# Find cmark # Find cmark
find_package(cmark QUIET) find_package(cmark QUIET)

6
launcher/CMakeLists.txt
View file

@ -1309,12 +1309,16 @@ target_link_libraries(Launcher_logic
Launcher_murmur2 Launcher_murmur2
nbt++ nbt++
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
tomlplusplus::tomlplusplus
qdcss qdcss
BuildConfig BuildConfig
Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Widgets
qrcodegenerator qrcodegenerator
) )
if(TARGET PkgConfig::tomlplusplus)
target_link_libraries(Launcher_logic PkgConfig::tomlplusplus)
else()
target_link_libraries(Launcher_logic tomlplusplus::tomlplusplus)
endif()
if (UNIX AND NOT CYGWIN AND NOT APPLE) if (UNIX AND NOT CYGWIN AND NOT APPLE)
target_link_libraries(Launcher_logic target_link_libraries(Launcher_logic