Attachment #1509 for bug #1651

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




endif( )


# openGL (kdesktop or kcontrol or tdescreensaver )
if( WITH_OPENGL )
  pkg_search_module( GL gl )
  if( GL_FOUND )
    # some extra check, stricktly speaking they are not necessary
    tde_save( CMAKE_REQUIRED_LIBRARIES )
    set( CMAKE_REQUIRED_LIBRARIES ${GL_LIBRARIES} )
    check_symbol_exists( glXChooseVisual "GL/glx.h" HAVE_GLXCHOOSEVISUAL )
    tde_restore( CMAKE_REQUIRED_LIBRARIES )
    if( NOT HAVE_GLXCHOOSEVISUAL )
      tde_message_fatal( "opengl is requested and found, but it doesn't provides glXChooseVisual() or GL/glx.h" )
    endif( )
  else( )
    tde_message_fatal( "opengl is requested, but not found on your system" )
  endif( )

  if( BUILD_KCONTROL )
    pkg_search_module( GLU glu )
    if( NOT GLU_FOUND )
      tde_message_fatal( "glu is required, but not found on your system" )
    endif( )
  endif( BUILD_KCONTROL )

endif( )






#
#################################################

# FIXME no OPENGL support yet

include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_BINARY_DIR}

  ${TQT_LIBRARY_DIRS}
)

if( WITH_OPENGL )
  add_definitions( -DINFO_OPENGL_AVAILABLE )
  set( OPENGL_DESKTOP opengl.desktop )
  set( OPENGL_SOURCES opengl.cpp )
endif( WITH_OPENGL )

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

install( FILES
    memory.desktop processor.desktop dma.desktop
    interrupts.desktop ioports.desktop pci.desktop
    sound.desktop devices.desktop scsi.desktop
    partitions.desktop xserver.desktop cdinfo.desktop
    ${OPENGL_DESKTOP}
  DESTINATION ${XDG_APPS_INSTALL_DIR} )


##### kcm_info (module) #########################

tde_add_kpart( kcm_info AUTOMOC
  SOURCES main.cpp memory.cpp ${OPENGL_SOURCES}
  LINK tdeui-shared ${GL_LIBRARIES} ${GLU_LIBRARIES}
  DESTINATION ${PLUGIN_INSTALL_DIR}
)

Lines 1-5 Link Here

(-)a/kcontrol/info/opengl.desktop (-2 / +2 lines)
1	[Desktop Entry]	1	[Desktop Entry]
2	NoDisplay=true	2	# NoDisplay=true
3	Exec=tdecmshell opengl	3	Exec=tdecmshell opengl
4	Icon=kcmopengl	4	Icon=kcmopengl
5	Type=Application	5	Type=Application
Lines 8-14 DocPath=kinfocenter/opengl/index.html Link Here
8		8
9	X-TDE-Library=info	9	X-TDE-Library=info
10	X-TDE-FactoryName=opengl	10	X-TDE-FactoryName=opengl
11	X-TDE-ParentApp=kcontrol	11	X-TDE-ParentApp=kinfocenter
12		12
13	Name=OpenGL	13	Name=OpenGL
14	Name[bn]=ওপেন-জি-এল	14	Name[bn]=ওপেন-জি-এল

Lines 32-37 tde_add_kpart( kcm_screensaver AUTOMOC Link Here

(-)a/kcontrol/screensaver/CMakeLists.txt (-1 / +1 lines)
32	advanceddialogimpl.ui scrnsave.cpp testwin.cpp	32	advanceddialogimpl.ui scrnsave.cpp testwin.cpp
33	saverlist.cpp saverconfig.cpp advanceddialog.cpp	33	saverlist.cpp saverconfig.cpp advanceddialog.cpp
34	kswidget.cpp	34	kswidget.cpp
35	LINK tdeio-shared ${GL_LIBRARY}	35	LINK tdeio-shared ${GL_LIBRARIES}
36	DESTINATION ${PLUGIN_INSTALL_DIR}	36	DESTINATION ${PLUGIN_INSTALL_DIR}
37	)	37	)

Lines 38-43 set( ${target}_SRCS Link Here

(-)a/kdesktop/lock/CMakeLists.txt (-1 / +1 lines)
38	tde_add_executable( ${target} AUTOMOC	38	tde_add_executable( ${target} AUTOMOC
39	SOURCES ${${target}_SRCS}	39	SOURCES ${${target}_SRCS}
40	LINK kdesktopsettings-static dmctl-static tdeio-shared Xext	40	LINK kdesktopsettings-static dmctl-static tdeio-shared Xext
41	${GL_LIBRARY} "${LINKER_IMMEDIATE_BINDING_FLAGS}"	41	${GL_LIBRARIES} "${LINKER_IMMEDIATE_BINDING_FLAGS}"
42	DESTINATION ${BIN_INSTALL_DIR}	42	DESTINATION ${BIN_INSTALL_DIR}
43	)	43	)

Lines 30-36 install( FILES KRandom.desktop KBlankscreen.desktop DESTINATION ${APPS_INSTALL_D Link Here

(-)a/tdescreensaver/CMakeLists.txt (-1 / +1 lines)
30		30
31	tde_add_executable( krandom.kss AUTOMOC	31	tde_add_executable( krandom.kss AUTOMOC
32	SOURCES random.cpp	32	SOURCES random.cpp
33	LINK tdeui-shared ${GL_LIBRARY}	33	LINK tdeui-shared ${GL_LIBRARIES}
34	DESTINATION ${BIN_INSTALL_DIR}	34	DESTINATION ${BIN_INSTALL_DIR}
35	)	35	)
36		36

Lines 92-98 bool hasDirectRendering () { Link Here

(-)a/tdescreensaver/random.cpp (-2 / +1 lines)
92	return false;	92	return false;
93	}	93	}
94	#else	94	#else
95	#error no GL?	95	// no GL
96	return false;	96	return false;
97	#endif	97	#endif
98		98
99	-

Return to bug 1651

Lines 168-179 if( WITH_XSCREENSAVER ) Link Here

(-)a/ConfigureChecks.cmake (-5 / +22 lines)
168	endif( )	168	endif( )
169		169
170		170
171	# GL	171	# openGL (kdesktop or kcontrol or tdescreensaver )
172	if( BUILD_KDESKTOP OR BUILD_KCONTROL OR BUILD_TDESCREENSAVER )	172	if( WITH_OPENGL )
173	check_library_exists( GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL )	173	pkg_search_module( GL gl )
174	if( HAVE_GLXCHOOSEVISUAL )	174	if( GL_FOUND )
175	set( GL_LIBRARY "GL" )	175	# some extra check, stricktly speaking they are not necessary
		176	tde_save( CMAKE_REQUIRED_LIBRARIES )
		177	set( CMAKE_REQUIRED_LIBRARIES ${GL_LIBRARIES} )
		178	check_symbol_exists( glXChooseVisual "GL/glx.h" HAVE_GLXCHOOSEVISUAL )
		179	tde_restore( CMAKE_REQUIRED_LIBRARIES )
		180	if( NOT HAVE_GLXCHOOSEVISUAL )
		181	tde_message_fatal( "opengl is requested and found, but it doesn't provides glXChooseVisual() or GL/glx.h" )
		182	endif( )
		183	else( )
		184	tde_message_fatal( "opengl is requested, but not found on your system" )
176	endif( )	185	endif( )
		186
		187	if( BUILD_KCONTROL )
		188	pkg_search_module( GLU glu )
		189	if( NOT GLU_FOUND )
		190	tde_message_fatal( "glu is required, but not found on your system" )
		191	endif( )
		192	endif( BUILD_KCONTROL )
		193
177	endif( )	194	endif( )
178		195
179		196

Lines 28-33 include( CheckCXXSourceRuns ) Link Here

(-)a/CMakeLists.txt (+2 lines)
28	include( CheckCXXSourceCompiles )	28	include( CheckCXXSourceCompiles )
29	include( CheckLibraryExists )	29	include( CheckLibraryExists )
30	include( CheckFunctionExists )	30	include( CheckFunctionExists )
		31	include( CheckSymbolExists )
31	include( CheckStructHasMember )	32	include( CheckStructHasMember )
32	include( CheckTypeSize )	33	include( CheckTypeSize )
33		34
Lines 70-75 option( WITH_XRENDER "Enable xrender support" ${WITH_ALL_OPTIONS} ) Link Here
70	option( WITH_XDAMAGE "Enable xdamage support" ${WITH_ALL_OPTIONS} )	71	option( WITH_XDAMAGE "Enable xdamage support" ${WITH_ALL_OPTIONS} )
71	option( WITH_XEXT "Enable xext support" ${WITH_ALL_OPTIONS} )	72	option( WITH_XEXT "Enable xext support" ${WITH_ALL_OPTIONS} )
72	option( WITH_XTEST "Enable xtest support" ${WITH_ALL_OPTIONS} )	73	option( WITH_XTEST "Enable xtest support" ${WITH_ALL_OPTIONS} )
		74	option( WITH_OPENGL "Enable openGL support" ${WITH_ALL_OPTIONS} )
73	option( WITH_XSCREENSAVER "Enable xscreensaver support" ${WITH_ALL_OPTIONS} )	75	option( WITH_XSCREENSAVER "Enable xscreensaver support" ${WITH_ALL_OPTIONS} )
74	option( WITH_LIBART "Enable libart support (for SVG icons and wallpapers)" ${WITH_ALL_OPTIONS} )	76	option( WITH_LIBART "Enable libart support (for SVG icons and wallpapers)" ${WITH_ALL_OPTIONS} )
75	option( WITH_LIBUSB "Enable control of some mouse models through libusb" ${WITH_ALL_OPTIONS} )	77	option( WITH_LIBUSB "Enable control of some mouse models through libusb" ${WITH_ALL_OPTIONS} )

Lines 9-16 Link Here

(-)a/kcontrol/info/CMakeLists.txt (-6 / +11 lines)
9	#	9	#
10	#################################################	10	#################################################
11		11
12	# FIXME no OPENGL support yet
13
14	include_directories(	12	include_directories(
15	${CMAKE_CURRENT_BINARY_DIR}	13	${CMAKE_CURRENT_BINARY_DIR}
16	${CMAKE_BINARY_DIR}	14	${CMAKE_BINARY_DIR}
Lines 22-41 link_directories( Link Here
22	${TQT_LIBRARY_DIRS}	20	${TQT_LIBRARY_DIRS}
23	)	21	)
24		22
		23	if( WITH_OPENGL )
		24	add_definitions( -DINFO_OPENGL_AVAILABLE )
		25	set( OPENGL_DESKTOP opengl.desktop )
		26	set( OPENGL_SOURCES opengl.cpp )
		27	endif( WITH_OPENGL )
		28
25	##### other data ################################	29	##### other data ################################
26		30
27	install( FILES	31	install( FILES
28	memory.desktop processor.desktop dma.desktop	32	memory.desktop processor.desktop dma.desktop
29	interrupts.desktop ioports.desktop opengl.desktop	33	interrupts.desktop ioports.desktop pci.desktop
30	pci.desktop sound.desktop devices.desktop scsi.desktop	34	sound.desktop devices.desktop scsi.desktop
31	partitions.desktop xserver.desktop cdinfo.desktop	35	partitions.desktop xserver.desktop cdinfo.desktop
		36	${OPENGL_DESKTOP}
32	DESTINATION ${XDG_APPS_INSTALL_DIR} )	37	DESTINATION ${XDG_APPS_INSTALL_DIR} )
33		38
34		39
35	##### kcm_info (module) #########################	40	##### kcm_info (module) #########################
36		41
37	tde_add_kpart( kcm_info AUTOMOC	42	tde_add_kpart( kcm_info AUTOMOC
38	SOURCES main.cpp memory.cpp opengl.cpp	43	SOURCES main.cpp memory.cpp ${OPENGL_SOURCES}
39	LINK tdeui-shared	44	LINK tdeui-shared ${GL_LIBRARIES} ${GLU_LIBRARIES}
40	DESTINATION ${PLUGIN_INSTALL_DIR}	45	DESTINATION ${PLUGIN_INSTALL_DIR}
41	)	46	)