mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-01 03:40:16 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into infoplugins and fix up problematic bits. This

Browse Source 
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
This commit is contained in:
Jeff Mitchell
2012-05-18 00:15:56 -04:00
parent 42faa354ec 32e1a16ead
commit 65c8739da5
62 changed files with 962 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeModules/AddTomahawkPlugin.cmake
View File

@@ -76,6 +76,12 @@ macro(add_tomahawk_plugin)
add_definitions(${QT_DEFINITIONS})
set_target_properties(${target} PROPERTIES AUTOMOC TRUE COMPILE_DEFINITIONS ${PLUGIN_EXPORT_MACRO})
if(PLUGIN_COMPILE_DEFINITIONS)
# Dear CMake, i hate you! Sincerely, domme
# At least in CMake 2.8.8, you CANNOT set more than one COMPILE_DEFINITIONS value
# only takes the first one if called multiple times or bails out with wrong number of arguments
# when passing in a list, thus i redefine the export macro here in hope it won't mess up other targets
add_definitions( "-D${PLUGIN_EXPORT_MACRO}" )
set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS ${PLUGIN_COMPILE_DEFINITIONS})
endif()