Attachment #588 for bug #984

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 984
Collapse All | Expand All




#################################################
#
#  Improvements and feedback are welcome
#
#  This file is released under GPL >= 2
#
#################################################

include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_BINARY_DIR}
  ${CMAKE_BINARY_DIR}/amarok/src/amarokcore
  ${CMAKE_SOURCE_DIR}/amarok/src
  ${CMAKE_SOURCE_DIR}/amarok/src/engine/akode
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
  ${AKODE_INCLUDE_DIRS}
)

link_directories(
  ${TQT_LIBRARY_DIRS}
)


##### other data ################################

install( FILES amarok_aKode-engine.desktop DESTINATION ${SERVICES_INSTALL_DIR} )


##### libamarok_aKode-engine (module) ############

tde_add_kpart( libamarok_aKode-engine AUTOMOC
  SOURCES
    akode-scope.cpp akode-engine.cpp
  LINK amarok-shared ${AKODE_LIBRARIES}
  DESTINATION ${PLUGIN_INSTALL_DIR}
)

Lines 14-16 Link Here

(-)amarok.ORI/amarok/src/engine/CMakeLists.txt (+1 lines)
14	add_subdirectory( void )	14	add_subdirectory( void )
15	tde_conditional_add_subdirectory( WITH_XINE xine )	15	tde_conditional_add_subdirectory( WITH_XINE xine )
16	tde_conditional_add_subdirectory( WITH_YAUAP yauap )	16	tde_conditional_add_subdirectory( WITH_YAUAP yauap )
		17	tde_conditional_add_subdirectory( WITH_AKODE akode )

Lines 47-52 Link Here

(-)amarok.ORI/CMakeLists.txt (+1 lines)
47	option( WITH_KONQSIDEBAR "Enable konqsidebar plugin" OFF )	47	option( WITH_KONQSIDEBAR "Enable konqsidebar plugin" OFF )
48	option( WITH_XINE "Enable xine-engine support" OFF )	48	option( WITH_XINE "Enable xine-engine support" OFF )
49	option( WITH_YAUAP "Enable yauap-engine support" OFF )	49	option( WITH_YAUAP "Enable yauap-engine support" OFF )
		50	option( WITH_AKODE "Enable akode-engine support" OFF )
50	option( WITH_IPOD "Enable iPod support from libgpod" OFF )	51	option( WITH_IPOD "Enable iPod support from libgpod" OFF )
51	option( WITH_IFP "Enable ifp support" OFF )	52	option( WITH_IFP "Enable ifp support" OFF )
52	option( WITH_NJB "Enable njb support" OFF )	53	option( WITH_NJB "Enable njb support" OFF )




  endif( )
endif( )

# akode-engine
if( WITH_AKODE )
  pkg_search_module( AKODE akode )
  if( AKODE_FOUND )
    if( ${AKODE_VERSION} VERSION_LESS "2.0.0" )
      tde_message_fatal( "your akode version is too old; at least 2.0.0 is required" )
    endif( )
  else( )
    tde_message_fatal( "akode is requested, but was not found on your system" )
  endif( )
endif( )


# iPod
if( WITH_IPOD )

Return to bug 984

Lines 121-126 Link Here

(-)amarok.ORI/ConfigureChecks.cmake (+12 lines)
121	endif( )	121	endif( )
122	endif( )	122	endif( )
123		123
		124	# akode-engine
		125	if( WITH_AKODE )
		126	pkg_search_module( AKODE akode )
		127	if( AKODE_FOUND )
		128	if( ${AKODE_VERSION} VERSION_LESS "2.0.0" )
		129	tde_message_fatal( "your akode version is too old; at least 2.0.0 is required" )
		130	endif( )
		131	else( )
		132	tde_message_fatal( "akode is requested, but was not found on your system" )
		133	endif( )
		134	endif( )
		135
124		136
125	# iPod	137	# iPod
126	if( WITH_IPOD )	138	if( WITH_IPOD )

Line 0 Link Here

(-)amarok.ORI/amarok/src/engine/akode/CMakeLists.txt (+37 lines)
	1	#################################################
	2	#
	3	# Improvements and feedback are welcome
	4	#
	5	# This file is released under GPL >= 2
	6	#
	7	#################################################
	8
	9	include_directories(
	10	${CMAKE_CURRENT_BINARY_DIR}
	11	${CMAKE_BINARY_DIR}
	12	${CMAKE_BINARY_DIR}/amarok/src/amarokcore
	13	${CMAKE_SOURCE_DIR}/amarok/src
	14	${CMAKE_SOURCE_DIR}/amarok/src/engine/akode
	15	${TDE_INCLUDE_DIR}
	16	${TQT_INCLUDE_DIRS}
	17	${AKODE_INCLUDE_DIRS}
	18	)
	19
	20	link_directories(
	21	${TQT_LIBRARY_DIRS}
	22	)
	23
	24
	25	##### other data ################################
	26
	27	install( FILES amarok_aKode-engine.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
	28
	29
	30	##### libamarok_aKode-engine (module) ############
	31
	32	tde_add_kpart( libamarok_aKode-engine AUTOMOC
	33	SOURCES
	34	akode-scope.cpp akode-engine.cpp
	35	LINK amarok-shared ${AKODE_LIBRARIES}
	36	DESTINATION ${PLUGIN_INSTALL_DIR}
	37	)