Attachment #810 for bug #818

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 818
Collapse All | Expand All

Lines 54-60 Link Here

(-)CMakeLists.txt (-1 / +1 lines)
54	option( WITH_MTP "Enable mtp support" OFF )	54	option( WITH_MTP "Enable mtp support" OFF )
55	option( WITH_RIOKARMA "Enable riokarma support" OFF )	55	option( WITH_RIOKARMA "Enable riokarma support" OFF )
56	option( WITH_DAAP "Enable daap support" OFF )	56	option( WITH_DAAP "Enable daap support" OFF )
57		57	option( ENABLE_POSTGRESQL "Enable PostgreSQL support" OFF )
58		58
59	##### user requested modules ####################	59	##### user requested modules ####################
60		60




endif( )


# Postgresql
if( ENABLE_POSTGRESQL )

  find_package( PostgreSQL )

  if( PostgreSQL_FOUND )
    set( USE_POSTGRESQL 1 )
  else( )
    tde_message_fatal( "enable postgresql is requested, but was not found on your system" )
  endif( )

endif( )


# common required stuff
find_package( TQt )
find_package( TDE )

Lines 14-19 Link Here

(-)config.h.cmake (-1 / +3 lines)
14	#cmakedefine HAVE_MP4V2 1	14	#cmakedefine HAVE_MP4V2 1
15	#cmakedefine HAVE_TUNEPIMP 1	15	#cmakedefine HAVE_TUNEPIMP 1
16		16
		17	#cmakedefine USE_POSTGRESQL 1
		18
17	#cmakedefine TAGLIB_15 1	19	#cmakedefine TAGLIB_15 1
18	#cmakedefine HAVE_QGLWIDGET 1	20	#cmakedefine HAVE_QGLWIDGET 1
19	#cmakedefine HAVE_OLD_RUBY @HAVE_OLD_RUBY@	21	#cmakedefine HAVE_OLD_RUBY @HAVE_OLD_RUBY@

Lines 27-32 Link Here

(-)amarok/src/CMakeLists.txt (-1 / +9 lines)
27	add_subdirectory( device )	27	add_subdirectory( device )
28	add_subdirectory( collectionscanner )	28	add_subdirectory( collectionscanner )
29		29
		30	IF( ENABLE_POSTGRESQL )
		31	SET(db_libs ${PostgreSQL_LIBRARIES})
		32	SET(db_dirs ${PostgreSQL_LIBRARY_DIRS})
		33	SET(db_incs ${PostgreSQL_INCLUDE_DIRS})
		34	ENDIF(ENABLE_POSTGRESQL)
		35
30	include_directories(	36	include_directories(
31	${CMAKE_CURRENT_BINARY_DIR}	37	${CMAKE_CURRENT_BINARY_DIR}
32	${CMAKE_CURRENT_SOURCE_DIR}	38	${CMAKE_CURRENT_SOURCE_DIR}
Lines 41-50 Link Here
41	${TQT_INCLUDE_DIRS}	47	${TQT_INCLUDE_DIRS}
42	${TAGLIB_INCLUDE_DIRS}	48	${TAGLIB_INCLUDE_DIRS}
43	${SQLITE_INCLUDE_DIRS}	49	${SQLITE_INCLUDE_DIRS}
		50	${db_incs}
44	)	51	)
45		52
46	link_directories(	53	link_directories(
47	${TQT_LIBRARY_DIRS}	54	${TQT_LIBRARY_DIRS}
		55	${db_dirs}
48	)	56	)
49		57
50		58
Lines 105-110 Link Here
105	metadata-static statusbar-static	113	metadata-static statusbar-static
106	LINK	114	LINK
107	khtml-shared knewstuff-shared	115	khtml-shared knewstuff-shared
108	GL ${TAGLIB_LIBRARIES} ${SQLITE_LIBRARIES} pthread	116	GL ${TAGLIB_LIBRARIES} ${SQLITE_LIBRARIES} ${db_libs} pthread
109	DESTINATION ${LIB_INSTALL_DIR}	117	DESTINATION ${LIB_INSTALL_DIR}
110	)	118	)

Return to bug 818

Lines 176-181 Link Here

(-)ConfigureChecks.cmake (+14 lines)
176	endif( )	176	endif( )
177		177
178		178
		179	# Postgresql
		180	if( ENABLE_POSTGRESQL )
		181
		182	find_package( PostgreSQL )
		183
		184	if( PostgreSQL_FOUND )
		185	set( USE_POSTGRESQL 1 )
		186	else( )
		187	tde_message_fatal( "enable postgresql is requested, but was not found on your system" )
		188	endif( )
		189
		190	endif( )
		191
		192
179	# common required stuff	193	# common required stuff
180	find_package( TQt )	194	find_package( TQt )
181	find_package( TDE )	195	find_package( TDE )