From: Jörg Krause Date: Sun, 16 Jun 2019 13:33:52 +0000 (+0200) Subject: Drop CMAKE_SYSROOT from taglib-config X-Git-Tag: v1.12-beta-1~15^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18d424995fd7863211d3005893fdfff764312d18;p=taglib Drop CMAKE_SYSROOT from taglib-config Commit d4c938cbc766ffb400c09efb9e696fce2537d81e is about fixing taglib-config for proper cross-compilation. The fix is right in principle, but wrong about adding `CMAKE_SYSROOT`. The correct prefix path should be set outside of the config file as some embedded Linux distros like OpenWrt or OpenEmbedded install with a different DESTDIR, and dependent packages see a different sysroot. --- diff --git a/taglib-config.cmake b/taglib-config.cmake index 96ef6883..c91e28db 100644 --- a/taglib-config.cmake +++ b/taglib-config.cmake @@ -14,8 +14,8 @@ EOH exit 1; } -prefix=@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@ -exec_prefix=@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@CMAKE_INSTALL_PREFIX@ libdir=${exec_prefix}/lib includedir=${prefix}/include