SVN commit 1099530 by reed: add some missing include_directories M +4 -0 kwin/CMakeLists.txt M +1 -1 kwin/lib/CMakeLists.txt M +1 -1 plasma/generic/dataengines/geolocation/CMakeLists.txt --- branches/KDE/4.4/kdebase/workspace/kwin/CMakeLists.txt #1099529:1099530 @@ -26,6 +26,10 @@ 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 --- branches/KDE/4.4/kdebase/workspace/kwin/lib/CMakeLists.txt #1099529:1099530 @@ -8,7 +8,6 @@ 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 (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}) --- branches/KDE/4.4/kdebase/workspace/plasma/generic/dataengines/geolocation/CMakeLists.txt #1099529:1099530 @@ -49,7 +49,7 @@ find_package(libgps) macro_log_feature(LIBGPS_FOUND "libgps" "GPS support for geolocation" "http://gpsd.berlios.de/" FALSE "" "") if(LIBGPS_FOUND) - include_directories(${LIBGPS_INCLUDES}) + include_directories(${LIBGPS_INCLUDES} ${LIBGPS_INCLUDE_DIR}) set(plasma_geolocation_gps_SRCS location_gps.cpp) kde4_add_plugin(plasma-geolocation-gps ${plasma_geolocation_gps_SRCS}) target_link_libraries(plasma-geolocation-gps plasma-geolocation-interface ${LIBGPS_LIBRARIES})