yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix build system for ES

Browse source
This commit is contained in:
Martin Gräßlin 2010-11-28 16:06:46 +01:00 committed by Martin Gräßlin
parent 537b06a9ee
commit 8d7a861928
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -160,7 +160,7 @@ kde4_add_kdeinit_executable( kwin ${kwin_KDEINIT_SRCS})
target_link_libraries(kdeinit_kwin ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTSCRIPT_LIBRARY} kephal kworkspace kdecorations kwineffects ${X11_LIBRARIES}) target_link_libraries(kdeinit_kwin ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTSCRIPT_LIBRARY} kephal kworkspace kdecorations kwineffects ${X11_LIBRARIES})
if(OPENGL_FOUND) if(OPENGL_FOUND AND NOT OPENGLES_FOUND)
add_subdirectory(opengltest) add_subdirectory(opengltest)
target_link_libraries(kdeinit_kwin ${OPENGL_gl_LIBRARY}) target_link_libraries(kdeinit_kwin ${OPENGL_gl_LIBRARY})
# -ldl used by OpenGL code # -ldl used by OpenGL code
@ -170,7 +170,12 @@ if(OPENGL_FOUND)
endif(DL_LIBRARY) endif(DL_LIBRARY)
# must be after opengl, to be initialized first by the linker # must be after opengl, to be initialized first by the linker
target_link_libraries(kdeinit_kwin kwinnvidiahack) target_link_libraries(kdeinit_kwin kwinnvidiahack)
endif(OPENGL_FOUND) endif(OPENGL_FOUND AND NOT OPENGLES_FOUND)
if(OPENGLES_FOUND)
add_subdirectory(opengltest)
target_link_libraries(kdeinit_kwin ${OPENGLES_LIBRARIES} ${OPENGLES_EGL_LIBRARIES})
endif(OPENGLES_FOUND)
if (X11_Xrandr_FOUND) if (X11_Xrandr_FOUND)
target_link_libraries(kdeinit_kwin ${X11_Xrandr_LIB}) target_link_libraries(kdeinit_kwin ${X11_Xrandr_LIB})

9
lib/CMakeLists.txt
View file

@ -46,7 +46,7 @@ set_target_properties(kwineffects PROPERTIES VERSION 1.0.0 SOVERSION 1 )
install(TARGETS kwineffects EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS kwineffects EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
if(OPENGL_FOUND) if(OPENGL_FOUND AND NOT OPENGLES_FOUND)
target_link_libraries(kwineffects ${OPENGL_gl_LIBRARY}) target_link_libraries(kwineffects ${OPENGL_gl_LIBRARY})
target_link_libraries(kwineffects LINK_INTERFACE_LIBRARIES ${OPENGL_gl_LIBRARY}) target_link_libraries(kwineffects LINK_INTERFACE_LIBRARIES ${OPENGL_gl_LIBRARY})
# -ldl used by OpenGL code # -ldl used by OpenGL code
@ -55,7 +55,12 @@ if(OPENGL_FOUND)
target_link_libraries(kwineffects ${DL_LIBRARY}) target_link_libraries(kwineffects ${DL_LIBRARY})
endif(DL_LIBRARY) endif(DL_LIBRARY)
include_directories(${OPENGL_INCLUDE_DIR}) include_directories(${OPENGL_INCLUDE_DIR})
endif(OPENGL_FOUND) endif(OPENGL_FOUND AND NOT OPENGLES_FOUND)
if(OPENGLES_FOUND)
target_link_libraries(kwineffects ${OPENGLES_LIBRARIES} ${OPENGLES_EGL_LIBRARIES})
target_link_libraries(kwineffects LINK_INTERFACE_LIBRARIES ${OPENGLES_LIBRARIES} ${OPENGLES_EGL_LIBRARIES})
include_directories(${OPENGLES_INCLUDE_DIR})
endif(OPENGLES_FOUND)
if (X11_Xrender_FOUND) if (X11_Xrender_FOUND)
target_link_libraries(kwineffects ${X11_Xrender_LIB}) target_link_libraries(kwineffects ${X11_Xrender_LIB})
endif (X11_Xrender_FOUND) endif (X11_Xrender_FOUND)