diff --git a/src/declarativeimports/core/CMakeLists.txt b/src/declarativeimports/core/CMakeLists.txt
index ee8ee5da8..89fa12267 100644
--- a/src/declarativeimports/core/CMakeLists.txt
+++ b/src/declarativeimports/core/CMakeLists.txt
@@ -53,7 +53,7 @@ if(X11_FOUND)
   if(OPENGL_FOUND)
     target_link_libraries(corebindingsplugin ${OPENGL_gl_LIBRARY})
   endif()
-endif(X11_FOUND)
+endif()
 
 install(TARGETS corebindingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/core)
 install(FILES qmldir ToolTip.qml DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/core)
diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt
index a3d1c0cca..9400d9960 100644
--- a/src/plasma/CMakeLists.txt
+++ b/src/plasma/CMakeLists.txt
@@ -19,11 +19,11 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
     set(PLASMA_NO_PACKAGE_EXTRADATA TRUE)
     set(PLASMA_NO_KUTILS TRUE)
     set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE)
-endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
+endif()
 
 if(NOT X11_FOUND)
     set(PLASMA_NO_PACKAGEKIT TRUE)
-endif(NOT X11_FOUND)
+endif()
 
 #find_package(KdepimLibs 4.5.60)
 #find_package(Gpgme)
@@ -33,21 +33,21 @@ endif(NOT X11_FOUND)
 
 if(NOT PLASMA_NO_KIO)
    set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS})
-endif(NOT PLASMA_NO_KIO)
+endif()
 
 if(NOT PLASMA_NO_SOLID)
     set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} KF5::Solid)
-endif(NOT PLASMA_NO_SOLID)
+endif()
 
 if(NOT PLASMA_NO_PACKAGEKIT)
     add_definitions(-DPLASMA_ENABLE_PACKAGEKIT_SUPPORT=1)
     set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} Qt5::DBus)
-endif(NOT PLASMA_NO_PACKAGEKIT)
+endif()
 
 if (NOT PLASMA_NO_KUTILS)
    #FIXME: for kcmodule classes; should not be in libplasma if possible
     set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KCMUTILS_LIBS})
-endif(NOT PLASMA_NO_KUTILS)
+endif()
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-plasma.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-plasma.h)
 
@@ -158,11 +158,11 @@ target_link_libraries(Plasma
 
 if(X11_FOUND)
    target_link_libraries(Plasma Qt5::X11Extras ${X11_LIBRARIES})
-endif(X11_FOUND)
+endif()
 
 if(DL_LIBRARY)
     target_link_libraries(Plasma ${DL_LIBRARY})
-endif(DL_LIBRARY)
+endif()
 
 target_link_libraries(Plasma LINK_INTERFACE_LIBRARIES Qt5::Widgets KF5::KConfigWidgets)
 target_include_directories(Plasma PUBLIC
diff --git a/src/plasma/autotests/CMakeLists.txt b/src/plasma/autotests/CMakeLists.txt
index 505bcbe53..58c696e6b 100644
--- a/src/plasma/autotests/CMakeLists.txt
+++ b/src/plasma/autotests/CMakeLists.txt
@@ -17,7 +17,7 @@ MACRO(PLASMA_UNIT_TESTS)
                                      KF5::KService)
                if(QT_QTOPENGL_FOUND)
                    target_link_libraries(${_testname} Qt5::OpenGL)
-               endif(QT_QTOPENGL_FOUND)
+               endif()
                add_test(plasma-${_testname} ${_testname})
                ecm_mark_as_test(${_testname})
        ENDFOREACH(_testname)
@@ -38,9 +38,9 @@ ecm_mark_as_test(storagetest)
 
 if(QT_QTOPENGL_FOUND)
   target_link_libraries(storagetest Qt5::OpenGL)
-endif(QT_QTOPENGL_FOUND)
+endif()
 
 if(QCA2_FOUND)
    #  target_link_libraries(plasmoidpackagetest ${QCA2_LIBRARIES})
-endif(QCA2_FOUND)
+endif()
 
diff --git a/src/plasmaquick/autotests/CMakeLists.txt b/src/plasmaquick/autotests/CMakeLists.txt
index 1e538e20b..0706d40a9 100644
--- a/src/plasmaquick/autotests/CMakeLists.txt
+++ b/src/plasmaquick/autotests/CMakeLists.txt
@@ -21,7 +21,7 @@ MACRO(PLASMA_UNIT_TESTS)
                                     )
                if(QT_QTOPENGL_FOUND)
                    target_link_libraries(${_testname} ${QT_QTOPENGL_LIBRARY})
-               endif(QT_QTOPENGL_FOUND)
+               endif()
                add_test(plasma-${_testname} ${_testname})
                ecm_mark_as_test(${_testname})
        ENDFOREACH(_testname)
diff --git a/src/scriptengines/javascript/CMakeLists.txt b/src/scriptengines/javascript/CMakeLists.txt
index 12ad09754..6ad9be7d3 100644
--- a/src/scriptengines/javascript/CMakeLists.txt
+++ b/src/scriptengines/javascript/CMakeLists.txt
@@ -5,7 +5,7 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
     set(PLASMA_NO_KNEWSTUFF TRUE)
     set(PLASMA_NO_SOLID TRUE)
     set(PLASMA_NO_KIO TRUE)
-endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
+endif()
 
 set(simple_javascript_engine_SRCS
     common/extension_launchapp.cpp
diff --git a/src/scriptengines/qml/CMakeLists.txt b/src/scriptengines/qml/CMakeLists.txt
index c3f8d6523..a6cffc3dc 100644
--- a/src/scriptengines/qml/CMakeLists.txt
+++ b/src/scriptengines/qml/CMakeLists.txt
@@ -5,7 +5,7 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
     set(PLASMA_NO_KNEWSTUFF TRUE)
     set(PLASMA_NO_SOLID TRUE)
     set(PLASMA_NO_KIO TRUE)
-endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
+endif()
 
 #DECLARATIVE APPLET
 set(declarative_appletscript_SRCS
diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
index 9491316ec..07c4a749e 100644
--- a/src/shell/CMakeLists.txt
+++ b/src/shell/CMakeLists.txt
@@ -84,7 +84,7 @@ target_include_directories(plasma-shell PRIVATE "${CMAKE_BINARY_DIR}")
 if(X11_FOUND)
   target_link_libraries(plasma-shell ${X11_LIBRARIES} ${XCB_XCB_LIBRARY} )
   target_link_libraries(plasma-shell Qt5::X11Extras)
-endif(X11_FOUND)
+endif()
 
 install(TARGETS plasma-shell ${INSTALL_TARGETS_DEFAULT_ARGS})