diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2013-09-01 09:29:15 +0400 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-08 10:50:57 +0200 |
| commit | 440db91f914eb9ba19bd208c443638a508be8f46 (patch) | |
| tree | 7653d29e97ea4cbd8de38f166fa1a10abdf86e94 /kcontrol | |
| parent | d1a487948aec5f93306f32d07979b2af42e61e33 (diff) | |
| download | tdebase-440db91f914eb9ba19bd208c443638a508be8f46.tar.gz tdebase-440db91f914eb9ba19bd208c443638a508be8f46.zip | |
Add optional opengl support
Diffstat (limited to 'kcontrol')
| -rw-r--r-- | kcontrol/info/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | kcontrol/info/opengl.desktop | 4 | ||||
| -rw-r--r-- | kcontrol/screensaver/CMakeLists.txt | 2 |
3 files changed, 14 insertions, 9 deletions
diff --git a/kcontrol/info/CMakeLists.txt b/kcontrol/info/CMakeLists.txt index fdd30ef2f..58f941e13 100644 --- a/kcontrol/info/CMakeLists.txt +++ b/kcontrol/info/CMakeLists.txt @@ -9,8 +9,6 @@ # ################################################# -# FIXME no OPENGL support yet - include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} @@ -22,20 +20,27 @@ link_directories( ${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 opengl.desktop - pci.desktop sound.desktop devices.desktop scsi.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.cpp - LINK tdeui-shared + SOURCES main.cpp memory.cpp ${OPENGL_SOURCES} + LINK tdeui-shared ${GL_LIBRARIES} ${GLU_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/info/opengl.desktop b/kcontrol/info/opengl.desktop index c7cdf29a9..c6ec67758 100644 --- a/kcontrol/info/opengl.desktop +++ b/kcontrol/info/opengl.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -NoDisplay=true +# NoDisplay=true Exec=tdecmshell opengl Icon=kcmopengl Type=Application @@ -8,7 +8,7 @@ DocPath=kinfocenter/opengl/index.html X-TDE-Library=info X-TDE-FactoryName=opengl -X-TDE-ParentApp=kcontrol +X-TDE-ParentApp=kinfocenter Name=OpenGL Name[bn]=ওপেন-জি-এল diff --git a/kcontrol/screensaver/CMakeLists.txt b/kcontrol/screensaver/CMakeLists.txt index e57bc1eca..bb6bd8bf0 100644 --- a/kcontrol/screensaver/CMakeLists.txt +++ b/kcontrol/screensaver/CMakeLists.txt @@ -32,6 +32,6 @@ tde_add_kpart( kcm_screensaver AUTOMOC advanceddialogimpl.ui scrnsave.cpp testwin.cpp saverlist.cpp saverconfig.cpp advanceddialog.cpp kswidget.cpp - LINK tdeio-shared ${GL_LIBRARY} + LINK tdeio-shared ${GL_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) |