aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörg Krause <joerg.krause@embedded.rocks>2019-06-16 15:33:52 +0200
committerGitHub <noreply@github.com>2019-06-16 15:33:52 +0200
commit18d424995fd7863211d3005893fdfff764312d18 (patch)
tree3171bc48799416b77e07f4508c92e08f5c188f5f
parentba7adc2bc261ed634c2a964185bcffb9365ad2f4 (diff)
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.
-rw-r--r--taglib-config.cmake4
1 files changed, 2 insertions, 2 deletions
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