kde-fix
/
kwin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake Cleanup: empty endif

Browse Source
master
Martin Gräßlin 12 years ago
parent 58725744e5
commit 5ea22e362d
5 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File

42
CMakeLists.txt
Unescape Escape View File

@ -16,7 +16,7 @@ if(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
OPTION(KWIN_PLASMA_ACTIVE "Enable building KWin for Plasma Active." OFF)
else(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
OPTION(KWIN_PLASMA_ACTIVE "Enable building KWin for Plasma Active." On)
endif(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
endif()
# Binary name of KWin
set(KWIN_NAME "kwin")
@ -30,27 +30,27 @@ if(KWIN_PLASMA_ACTIVE)
set(KWIN_MOBILE_EFFECTS ON)
set(KWIN_BUILD_WITH_OPENGLES ON)
set(KWIN_NAME "kwinactive")
endif(KWIN_PLASMA_ACTIVE)
endif()
cmake_dependent_option(KWIN_BUILD_KAPPMENU "Build without appmenu support" ON "KWIN_BUILD_DECORATIONS" FALSE)
# KWIN_HAVE_XRENDER_COMPOSITING - whether XRender-based compositing support is available: may be disabled
if( KWIN_BUILD_XRENDER_COMPOSITING )
set( KWIN_HAVE_XRENDER_COMPOSITING 1 )
endif( KWIN_BUILD_XRENDER_COMPOSITING )
endif()
if(OPENGL_FOUND)
include_directories(${OPENGL_INCLUDE_DIR})
endif(OPENGL_FOUND)
endif()
if(OPENGL_EGL_FOUND)
include_directories(${OPENGLES_EGL_INCLUDE_DIR})
set(KWIN_HAVE_EGL 1)
endif(OPENGL_EGL_FOUND)
endif()
if(OPENGLES_FOUND)
include_directories(${OPENGLES_INCLUDE_DIR})
endif(OPENGLES_FOUND)
endif()
include_directories(${XCB_INCLUDE_DIR})
@ -76,11 +76,11 @@ add_subdirectory( libkwineffects )
add_subdirectory( killer )
if(KWIN_BUILD_KCMS)
add_subdirectory( kcmkwin )
endif(KWIN_BUILD_KCMS)
endif()
if( KWIN_BUILD_DECORATIONS )
add_subdirectory( clients )
endif( KWIN_BUILD_DECORATIONS )
endif()
add_subdirectory( data )
add_subdirectory( effects )
@ -150,7 +150,7 @@ if(KWIN_BUILD_SCRIPTING)
scripting/scriptingutils.cpp
scripting/timer.cpp
)
endif(KWIN_BUILD_SCRIPTING)
endif()
if(KWIN_BUILD_TABBOX)
set(
@ -163,18 +163,18 @@ if(KWIN_BUILD_TABBOX)
tabbox/tabboxconfig.cpp
tabbox/tabboxhandler.cpp
)
endif(KWIN_BUILD_TABBOX)
endif()
if(KWIN_BUILD_SCREENEDGES)
set(
kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS}
screenedge.cpp
)
endif(KWIN_BUILD_SCREENEDGES)
endif()
if(KWIN_HAVE_EGL)
set(kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS} eglonxbackend.cpp)
endif(KWIN_HAVE_EGL)
endif()
kde4_add_kcfg_files(kwin_KDEINIT_SRCS settings.kcfgc)
@ -196,19 +196,19 @@ if (XF86VM_LIBRARY)
set(kwinLibs ${kwinLibs} ${XF86VM_LIBRARY})
else(XF86VM_LIBRARY)
add_definitions(-DKWIN_NO_XF86VM)
endif(XF86VM_LIBRARY)
endif()
if(KWIN_BUILD_SCRIPTING)
set(kwinLibs ${kwinLibs} ${QT_QTSCRIPT_LIBRARY})
endif(KWIN_BUILD_SCRIPTING)
endif()
if(KWIN_BUILD_ACTIVITIES)
set(kwinLibs ${kwinLibs} ${KACTIVITIES_LIBRARY})
endif(KWIN_BUILD_ACTIVITIES)
endif()
if(OPENGL_EGL_FOUND)
set(kwinLibs ${kwinLibs} ${OPENGLES_EGL_LIBRARY})
endif(OPENGL_EGL_FOUND)
endif()
kde4_add_kdeinit_executable( kwin ${kwin_KDEINIT_SRCS})
@ -219,20 +219,20 @@ set_target_properties(kdeinit_kwin PROPERTIES OUTPUT_NAME kdeinit4_${KWIN_NAME})
if(OPENGL_FOUND)
if( KWIN_BUILD_OPENGL_1_COMPOSITING )
set_target_properties(kdeinit_kwin PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL_1)
endif( KWIN_BUILD_OPENGL_1_COMPOSITING )
endif()
add_subdirectory(opengltest)
target_link_libraries(kdeinit_kwin kwinglutils ${OPENGL_gl_LIBRARY})
# -ldl used by OpenGL code
find_library(DL_LIBRARY dl)
if (DL_LIBRARY)
target_link_libraries(kdeinit_kwin ${DL_LIBRARY})
endif(DL_LIBRARY)
endif()
# must be after opengl, to be initialized first by the linker
target_link_libraries(kdeinit_kwin kwinnvidiahack)
elseif(OPENGLES_FOUND)
target_link_libraries(kdeinit_kwin ${kwinLibs} kwinglesutils ${OPENGLES_LIBRARIES})
set_target_properties(kdeinit_kwin PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGLES")
endif(OPENGL_FOUND)
endif()
install(TARGETS kdeinit_kwin ${INSTALL_TARGETS_DEFAULT_ARGS} )
install(TARGETS kwin ${INSTALL_TARGETS_DEFAULT_ARGS} )
@ -245,7 +245,7 @@ if(OPENGLES_FOUND)
set_target_properties(kdeinit_kwin_gles PROPERTIES OUTPUT_NAME kdeinit4_${KWIN_NAME}_gles)
install(TARGETS kdeinit_kwin_gles ${INSTALL_TARGETS_DEFAULT_ARGS} )
install(TARGETS kwin_gles ${INSTALL_TARGETS_DEFAULT_ARGS} )
endif(OPENGLES_FOUND)
endif()
########### next target ###############
@ -268,7 +268,7 @@ install( FILES org.kde.KWin.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
if( KWIN_BUILD_SCRIPTING )
# Install the KWin/WindowSwitcher service type
install( FILES scripting/kwinscript.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
endif( KWIN_BUILD_SCRIPTING )
endif()
kde4_install_icons( ${ICON_INSTALL_DIR} )

2
clients/CMakeLists.txt
Unescape Escape View File

@ -1,6 +1,6 @@
add_subdirectory( aurorae )
if(KWIN_BUILD_OXYGEN)
add_subdirectory( oxygen )
endif(KWIN_BUILD_OXYGEN)
endif()
add_subdirectory( b2 )
add_subdirectory( laptop )

26
effects/CMakeLists.txt
Unescape Escape View File

@ -16,14 +16,14 @@ macro( KWIN4_ADD_EFFECT name )
target_link_libraries(kwin4_effect_${name} kwinglutils)
if( KWIN_BUILD_OPENGL_1_COMPOSITING )
set_target_properties(kwin4_effect_${name} PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL_1)
endif( KWIN_BUILD_OPENGL_1_COMPOSITING )
endif()
elseif(OPENGLES_FOUND)
target_link_libraries(kwin4_effect_${name} kwinglesutils)
set_target_properties(kwin4_effect_${name} PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGLES")
endif(OPENGL_FOUND)
endif()
set_target_properties(kwin4_effect_${name} PROPERTIES OUTPUT_NAME ${KWIN_NAME}4_effect_${name})
install( TARGETS kwin4_effect_${name} DESTINATION ${PLUGIN_INSTALL_DIR} )
endif(OPENGL_FOUND OR NOT(OPENGL_FOUND AND OPENGLES_FOUND))
endif()
if(OPENGLES_FOUND)
@ -33,7 +33,7 @@ macro( KWIN4_ADD_EFFECT name )
set_target_properties(kwin4_effect_gles_${name} PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGLES")
set_target_properties(kwin4_effect_gles_${name} PROPERTIES OUTPUT_NAME ${KWIN_NAME}4_effect_gles_${name})
install( TARGETS kwin4_effect_gles_${name} DESTINATION ${PLUGIN_INSTALL_DIR} )
endif(OPENGLES_FOUND)
endif()
endmacro( KWIN4_ADD_EFFECT )
macro( KWIN4_ADD_EFFECT_CONFIG name )
@ -45,14 +45,14 @@ macro( KWIN4_ADD_EFFECT_CONFIG name )
set( kwin4_effect_ui ${kwin4_effect_ui} ${file} )
else( file MATCHES \\.ui )
set( kwin4_effect_src ${kwin4_effect_src} ${file} )
endif( file MATCHES \\.ui )
endif()
endforeach( file )
kde4_add_ui_files( kwin4_effect_src ${kwin4_effect_ui} )
kde4_add_plugin( kcm_kwin4_effect_${name} ${kwin4_effect_src} )
if(OPENGLES_FOUND)
set_target_properties(kcm_kwin4_effect_${name} PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGLES")
endif(OPENGLES_FOUND)
endif()
target_link_libraries( kcm_kwin4_effect_${name} kwineffects ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} )
install( TARGETS kcm_kwin4_effect_${name} DESTINATION ${PLUGIN_INSTALL_DIR} )
endmacro( KWIN4_ADD_EFFECT_CONFIG )
@ -65,8 +65,8 @@ macro( KWIN4_EFFECT_LINK_XRENDER name )
# TODO: if building for OpenGL ES we should not build XRender support
if(OPENGLES_FOUND)
target_link_libraries( kwin4_effect_gles_${name} ${X11_Xrender_LIB} ${XCB_RENDER_LIBRARIES})
endif(OPENGLES_FOUND)
endif( KWIN_HAVE_XRENDER_COMPOSITING )
endif()
endif()
endmacro( KWIN4_EFFECT_LINK_XRENDER )
# Install the KWin/Effect service type
@ -76,7 +76,7 @@ install( FILES kwineffect.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
set( kwin4_effect_builtins_sources )
if( NOT KWIN_MOBILE_EFFECTS )
set( kwin4_effect_builtins_config_sources configs_builtins.cpp )
endif( NOT KWIN_MOBILE_EFFECTS )
endif()
set( kwin4_effect_include_directories )
# scripted effects
@ -87,7 +87,7 @@ add_subdirectory( login )
if( NOT KWIN_MOBILE_EFFECTS )
add_subdirectory( fadedesktop )
add_subdirectory( maximize )
endif( NOT KWIN_MOBILE_EFFECTS )
endif()
###############################################################################
# Built-in effects go here
@ -122,7 +122,7 @@ if( NOT KWIN_MOBILE_EFFECTS )
include( windowgeometry/CMakeLists.txt )
include( zoom/CMakeLists.txt )
include( logout/CMakeLists.txt )
endif( NOT KWIN_MOBILE_EFFECTS )
endif()
# OpenGL-specific effects
include( blur/CMakeLists.txt )
@ -144,7 +144,7 @@ if( NOT KWIN_MOBILE_EFFECTS )
include( startupfeedback/CMakeLists.txt )
include( trackmouse/CMakeLists.txt )
include( wobblywindows/CMakeLists.txt )
endif( NOT KWIN_MOBILE_EFFECTS )
endif()
###############################################################################
@ -152,5 +152,5 @@ endif( NOT KWIN_MOBILE_EFFECTS )
KWIN4_ADD_EFFECT( builtins ${kwin4_effect_builtins_sources} )
if( NOT KWIN_MOBILE_EFFECTS )
KWIN4_ADD_EFFECT_CONFIG( builtins ${kwin4_effect_builtins_config_sources} )
endif( NOT KWIN_MOBILE_EFFECTS )
endif()
KWIN4_EFFECT_LINK_XRENDER( builtins )

6
kcmkwin/CMakeLists.txt
Unescape Escape View File

@ -6,12 +6,12 @@ add_subdirectory( kwinrules )
add_subdirectory( kwincompositing )
if(KWIN_BUILD_SCREENEDGES)
add_subdirectory( kwinscreenedges )
endif(KWIN_BUILD_SCREENEDGES)
endif()
if(KWIN_BUILD_SCRIPTING)
add_subdirectory( kwinscripts )
endif(KWIN_BUILD_SCRIPTING)
endif()
add_subdirectory( kwindesktop )
if( KWIN_BUILD_TABBOX )
add_subdirectory( kwintabbox )
endif( KWIN_BUILD_TABBOX )
endif()

12
libkwineffects/CMakeLists.txt
Unescape Escape View File

@ -37,12 +37,12 @@ macro( KWIN4_ADD_GLUTILS_BACKEND name glinclude )
include_directories(${glinclude})
if(OPENGL_EGL_FOUND)
include_directories(${OPENGLES_EGL_INCLUDE_DIR})
endif(OPENGL_EGL_FOUND)
endif()
kde4_add_library(${name} SHARED ${kwin_GLUTILSLIB_SRCS})
target_link_libraries(${name} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_LIBRARIES} ${XCB_XCB_LIBRARIES} ${X11_XCB_LIBRARIES} kwineffects)
if(OPENGL_EGL_FOUND)
target_link_libraries(${name} ${OPENGLES_EGL_LIBRARY})
endif(OPENGL_EGL_FOUND)
endif()
set_target_properties(${name} PROPERTIES VERSION 1.0.0 SOVERSION 1 )
target_link_libraries(${name} ${ARGN})
target_link_libraries(${name} LINK_INTERFACE_LIBRARIES ${ARGN})
@ -54,14 +54,14 @@ if(OPENGLES_FOUND)
KWIN4_ADD_GLUTILS_BACKEND(kwinglesutils ${OPENGLES_INCLUDE_DIR} ${OPENGLES_LIBRARIES})
set_target_properties(kwinglesutils PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGLES)
set_target_properties(kwinglesutils PROPERTIES OUTPUT_NAME ${KWIN_NAME}glesutils)
endif(OPENGLES_FOUND)
endif()
if(OPENGL_FOUND)
KWIN4_ADD_GLUTILS_BACKEND(kwinglutils ${OPENGL_INCLUDE_DIR} ${OPENGL_gl_LIBRARY})
set_target_properties(kwinglutils PROPERTIES OUTPUT_NAME ${KWIN_NAME}glutils)
if( KWIN_BUILD_OPENGL_1_COMPOSITING )
set_target_properties(kwinglutils PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL_1)
endif( KWIN_BUILD_OPENGL_1_COMPOSITING )
endif()
target_link_libraries(kwinglutils ${OPENGL_gl_LIBRARY})
target_link_libraries(kwinglutils LINK_INTERFACE_LIBRARIES ${OPENGL_gl_LIBRARY})
@ -69,8 +69,8 @@ if(OPENGL_FOUND)
find_library(DL_LIBRARY dl)
if (DL_LIBRARY)
target_link_libraries(kwinglutils ${DL_LIBRARY})
endif(DL_LIBRARY)
endif(OPENGL_FOUND)
endif()
endif()
install( FILES
kwinglobals.h

Write Preview
Loading…
Cancel
Save