All pastes #759605 Raw Edit

no-gl fix

public text v1 · immutable
#759605 ·published 2007-11-03 09:59 UTC
rendered paste body
--- workspace/libs/plasma/CMakeLists.txt        (revision 732232)
+++ workspace/libs/plasma/CMakeLists.txt        (working copy)
@@ -68,17 +68,19 @@
     appletbrowser/kcategorizeditemsviewbase.ui
 )

+
+kde4_add_library(plasma SHARED ${plasma_LIB_SRCS})
+
 if(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
 MESSAGE(STATUS "Adding support for OpenGL applets to libplasma")
 set(plasma_LIB_SRCS
     ${plasma_LIB_SRCS}
     glapplet.cpp)
+    target_link_libraries(plasma ${KDE4_KIO_LIBS} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} ${QT_QTUITOOLS_LIBRARY})
+else(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
+    target_link_libraries(plasma ${KDE4_KIO_LIBS} ${QT_QTOPENGL_LIBRARY} ${QT_QTUITOOLS_LIBRARY})
 endif(QT_QTOPENGL_FOUND AND OPENGL_FOUND)

-kde4_add_library(plasma SHARED ${plasma_LIB_SRCS})
-
-target_link_libraries(plasma ${KDE4_KIO_LIBS} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} ${QT_QTUITOOLS_LIBRARY})
-
 set_target_properties(plasma PROPERTIES VERSION 1.0.0 SOVERSION 1)
 install(TARGETS plasma DESTINATION ${LIB_INSTALL_DIR})