]> granicus.if.org Git - taglib/commitdiff
Drop CMAKE_SYSROOT from taglib-config
authorJörg Krause <joerg.krause@embedded.rocks>
Sun, 16 Jun 2019 13:33:52 +0000 (15:33 +0200)
committerGitHub <noreply@github.com>
Sun, 16 Jun 2019 13:33:52 +0000 (15:33 +0200)
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.

taglib-config.cmake

index 96ef688329e21278b85eb52e3bbd98e800b22974..c91e28db30aa71ef2a36f38e34b8b656cbc400b4 100644 (file)
@@ -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