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

merge 1099530 from 4.4: add some missing include_directories

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1099533
This commit is contained in:
Benjamin Reed 2010-03-05 18:30:04 +00:00
parent 8bddbfca46
commit dc233bdcd5
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -26,6 +26,10 @@ macro_log_feature(KWIN_HAVE_COMPOSITING "Compositing support" "X11 Compositing s
macro_bool_to_01( OPENGL_FOUND KWIN_HAVE_OPENGL )
if(OPENGL_FOUND)
include_directories(${OPENGL_INCLUDE_DIR})
endif(OPENGL_FOUND)
# for things that are also used by kwin libraries
configure_file(lib/kwinconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/lib/kwinconfig.h )
# for kwin internal things

2
lib/CMakeLists.txt
View file

@ -8,7 +8,6 @@ set(kdecorations_LIB_SRCS
kcommondecoration.cpp
kcommondecoration_p.cpp )
kde4_add_library(kdecorations SHARED ${kdecorations_LIB_SRCS})
target_link_libraries(kdecorations ${KDE4_KDEUI_LIBS} kephal)
@ -54,6 +53,7 @@ if(OPENGL_FOUND)
if (DL_LIBRARY)
target_link_libraries(kwineffects ${DL_LIBRARY})
endif(DL_LIBRARY)
include_directories(${OPENGL_INCLUDE_DIR})
endif(OPENGL_FOUND)
if (X11_Xrender_FOUND)
target_link_libraries(kwineffects ${X11_Xrender_LIB})