1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-02-24 03:43:56 +01:00
tomahawk/CMakeModules
Jeff Mitchell 65c8739da5 Merge branch 'master' into infoplugins and fix up problematic bits. This
fully separates out all infoplugins into separate buildable units.
Eventually I'll make cmake switches to enable easy picking of the
different plugins at build-time; distros will like that.

Conflicts:
	src/infoplugins/generic/CMakeLists.txt
	src/infoplugins/generic/ChartsPlugin.cpp
	src/infoplugins/generic/ChartsPlugin.h
	src/infoplugins/generic/ChartsPlugin_Data_p.h
	src/infoplugins/generic/charts/ChartsPlugin.cpp
	src/infoplugins/generic/charts/ChartsPlugin.h
	src/infoplugins/generic/hypem/HypemPlugin.cpp
	src/infoplugins/generic/hypem/HypemPlugin.h
	src/infoplugins/generic/hypemPlugin.cpp
	src/infoplugins/generic/hypemPlugin.h
	src/libtomahawk/CMakeLists.txt
	src/libtomahawk/CountryUtils.h
	src/libtomahawk/infosystem/InfoSystemWorker.cpp
	src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.cpp
	src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.h
	src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin_Data_p.h
	src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.cpp
	src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.h
2012-05-18 00:47:32 -04:00
..

FindTaglib.cmake taken from KDE4 kdelibs/cmake/Modules