From ea83a9c57868b24c8ccec740099b661602daa946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Mon, 25 Feb 2013 11:44:26 +0100 Subject: [PATCH] Cmake cleanup: empty endfoo() --- effects/CMakeLists.txt | 10 +++++----- libkwineffects/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt index 20b0d7e120..0d6c0e41d7 100644 --- a/effects/CMakeLists.txt +++ b/effects/CMakeLists.txt @@ -5,7 +5,7 @@ macro( KWIN4_ADD_EFFECT_BACKEND name ) kde4_add_plugin( ${name} ${ARGN} ) target_link_libraries( ${name} kwineffects ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${X11_Xfixes_LIB} ${X11_Xcursor_LIB} ${X11_LIBRARIES} ${XCB_XCB_LIBRARIES} ${XCB_IMAGE_LIBRARIES} ${X11_XCB_LIBRARIES} ${XCB_XFIXES_LIBRARIES}) -endmacro( KWIN4_ADD_EFFECT_BACKEND ) +endmacro() # Adds effect plugin with given name. Sources are given after the name macro( KWIN4_ADD_EFFECT name ) @@ -34,7 +34,7 @@ macro( KWIN4_ADD_EFFECT name ) 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() -endmacro( KWIN4_ADD_EFFECT ) +endmacro() macro( KWIN4_ADD_EFFECT_CONFIG name ) set( kwin4_effect_ui ) # Initially empty @@ -46,7 +46,7 @@ macro( KWIN4_ADD_EFFECT_CONFIG name ) else( file MATCHES \\.ui ) set( kwin4_effect_src ${kwin4_effect_src} ${file} ) endif() - endforeach( file ) + endforeach() kde4_add_ui_files( kwin4_effect_src ${kwin4_effect_ui} ) kde4_add_plugin( kcm_kwin4_effect_${name} ${kwin4_effect_src} ) @@ -55,7 +55,7 @@ macro( KWIN4_ADD_EFFECT_CONFIG name ) 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 ) +endmacro() macro( KWIN4_EFFECT_LINK_XRENDER name ) if( KWIN_HAVE_XRENDER_COMPOSITING ) @@ -67,7 +67,7 @@ macro( KWIN4_EFFECT_LINK_XRENDER name ) target_link_libraries( kwin4_effect_gles_${name} ${X11_Xrender_LIB} ${XCB_RENDER_LIBRARIES}) endif() endif() -endmacro( KWIN4_EFFECT_LINK_XRENDER ) +endmacro() # Install the KWin/Effect service type install( FILES kwineffect.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) diff --git a/libkwineffects/CMakeLists.txt b/libkwineffects/CMakeLists.txt index 71dae9c153..96445ef242 100644 --- a/libkwineffects/CMakeLists.txt +++ b/libkwineffects/CMakeLists.txt @@ -48,7 +48,7 @@ macro( KWIN4_ADD_GLUTILS_BACKEND name glinclude ) target_link_libraries(${name} LINK_INTERFACE_LIBRARIES ${ARGN}) install(TARGETS ${name} EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) -endmacro( KWIN4_ADD_GLUTILS_BACKEND ) +endmacro() if(OPENGLES_FOUND) KWIN4_ADD_GLUTILS_BACKEND(kwinglesutils ${OPENGLES_INCLUDE_DIR} ${OPENGLES_LIBRARIES})