Remove obsolete parameter in end... cmake keywords

9 files changed, 86 insertions, 86 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd8a4452..28cdff1b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ project(dbus)
 cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
 if(COMMAND cmake_policy)
     cmake_policy(SET CMP0003 NEW)
-endif(COMMAND cmake_policy)
+endif()
 
 if(CMAKE_MAJOR_VERSION GREATER 2)
     cmake_policy(SET CMP0026 NEW)
@@ -54,16 +54,16 @@ include(GNUInstallDirs)
 
 if(DBUSDIR)
     set(DBUS_INSTALL_DIR "${DBUSDIR}")
-endif(DBUSDIR)
+endif()
 if($ENV{DBUSDIR})
     set(DBUS_INSTALL_DIR "$ENV{DBUSDIR}")
-endif($ENV{DBUSDIR})
+endif()
 
 if(DBUS_INSTALL_DIR)
     set(CMAKE_INSTALL_PREFIX "${DBUS_INSTALL_DIR}" CACHE PATH "install prefix" FORCE)
 else(DBUS_INSTALL_DIR)
     set(DBUS_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
-endif(DBUS_INSTALL_DIR)
+endif()
 
 set(DBUS_PREFIX ${DBUS_INSTALL_DIR})
 
@@ -112,7 +112,7 @@ set(INSTALL_TARGETS_DEFAULT_ARGS EXPORT DBus1Targets RUNTIME DESTINATION ${CMAKE
 
 if(CYGWIN)
    set(WIN32)
-endif(CYGWIN)
+endif()
 
 # search for required packages
 if(WIN32)
@@ -121,12 +121,12 @@ if(WIN32)
     find_package(LibIconv)
     include(Win32Macros)
     addExplorerWrapper(${CMAKE_PROJECT_NAME})
-endif(WIN32)
+endif()
 
 if(NOT WIN32)
     set(CMAKE_THREAD_PREFER_PTHREAD ON)
     include(FindThreads)
-endif(NOT WIN32)
+endif()
 
 option(DBUS_DISABLE_ASSERT "Disable assertion checking" OFF)
 
@@ -158,7 +158,7 @@ include(MacroLibrary)
 
 if(VCS)
     set(DBUS_VERBOSE_C_S 1 CACHE STRING "verbose mode" FORCE)
-endif(VCS)
+endif()
 
 if(MSVC)
     # controll folders in msvc projects
@@ -166,7 +166,7 @@ if(MSVC)
     if(NOT GROUP_CODE)
         #set(GROUP_CODE split) #cmake default
         set(GROUP_CODE flat)
-    endif(NOT GROUP_CODE)
+    endif()
     add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
     set(CMAKE_C_FLAGS_DEBUG   "${CMAKE_C_FLAGS_DEBUG}   /FIconfig.h")
     set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /FIconfig.h")
@@ -231,7 +231,7 @@ if(UNIX AND NOT DBUS_DISABLE_ASSERT)
     set(CMAKE_C_FLAGS_DEBUG   "${CMAKE_C_FLAGS_DEBUG}   -Wl,--export-dynamic")
     set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wl,--export-dynamic")
     add_definitions(-DDBUS_BUILT_R_DYNAMIC)
-endif(UNIX AND NOT DBUS_DISABLE_ASSERT)
+endif()
 
 if(DBUS_WITH_GLIB)
     autodefine(GLIB_VERSION_MIN_REQUIRED)
@@ -262,7 +262,7 @@ if(WINCE)
 
 message("Building for WinCE (${CMAKE_SYSTEM_VERSION})")
 
-endif(WINCE)
+endif()
 #########################################################################
 
 
@@ -305,13 +305,13 @@ option(DBUS_BUILD_TESTS "enable unit test code" ON)
 if(DBUS_BUILD_TESTS)
     set(DBUS_ENABLE_EMBEDDED_TESTS ON)
     set(DBUS_ENABLE_MODULAR_TESTS ON)
-endif(DBUS_BUILD_TESTS)
+endif()
 
 option(DBUS_USE_OUTPUT_DEBUG_STRING "enable win32 debug port for message output" OFF)
 if(WIN32)
     # win32 dbus service support - this support is not complete
     option(DBUS_SERVICE "enable dbus service installer" OFF)
-endif(WIN32)
+endif()
 
 option(DBUS_ENABLE_ANSI "enable -ansi -pedantic gcc flags" OFF)
 if(DBUS_ENABLE_ANSI)
@@ -319,8 +319,8 @@ if(DBUS_ENABLE_ANSI)
         add_definitions(-ansi -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -pedantic)
    else(NOT MSVC)
         add_definitions(-Za -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -W4)
-   endif(NOT MSVC)
-endif(DBUS_ENABLE_ANSI)
+   endif()
+endif()
 
 option(DBUS_ENABLE_VERBOSE_MODE "support verbose debug mode" ON)
 
@@ -333,36 +333,36 @@ if(NOT MSVC)
             # FIXME!!!!
             ## remove optimization
     #        CFLAGS=`echo "$CFLAGS" | sed -e 's/-O[0-9]*//g'`
-    endif(DBUS_GCOV_ENABLED)
-endif(NOT MSVC)
+    endif()
+endif()
 
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
     option(DBUS_BUS_ENABLE_INOTIFY "build with inotify support (linux only)" ON)
     if(DBUS_BUS_ENABLE_INOTIFY)
         if(NOT HAVE_SYS_INOTIFY_H)
             message(FATAL_ERROR "sys/inotify.h not found!")
-        endif(NOT HAVE_SYS_INOTIFY_H)
-    endif(DBUS_BUS_ENABLE_INOTIFY)
+        endif()
+    endif()
 elseif("${CMAKE_SYSTEM_NAME}" MATCHES ".*BSD")
     option(DBUS_BUS_ENABLE_KQUEUE "build with kqueue support (FreeBSD only)" ON)
     if(DBUS_BUS_ENABLE_KQUEUE)
         if(NOT HAVE_SYS_EVENT_H)
             message(FATAL_ERROR "sys/event.h not found!")
-        endif(NOT HAVE_SYS_EVENT_H)
-    endif(DBUS_BUS_ENABLE_KQUEUE)
-endif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+        endif()
+    endif()
+endif()
 
 string(TOUPPER ${CMAKE_SYSTEM_NAME} sysname)
 if("${sysname}" MATCHES ".*SOLARIS.*")
     option(HAVE_CONSOLE_OWNER_FILE "enable console owner file(solaris only)" ON)
     if(HAVE_CONSOLE_OWNER_FILE)
         set(DBUS_CONSOLE_OWNER_FILE "/dev/console" CACHE STRING "Directory to check for console ownerhip")
-    endif(HAVE_CONSOLE_OWNER_FILE)
-endif("${sysname}" MATCHES ".*SOLARIS.*")
+    endif()
+endif()
 
 if(NOT EXPAT_FOUND)
     message(FATAL_ERROR "expat not found!")
-endif(NOT EXPAT_FOUND)
+endif()
 
 # all missing or hardcoded for now
 
@@ -384,20 +384,20 @@ if(CMAKE_COMPILER_IS_GNUCC AND NOT DBUS_ENABLE_ANSI)
             if("UNAME_OUTPUT" MATCHES "^.*i?86.*$")
                 set(atomic_int ON)
                 set(atomic_int_486 ON)
-            endif("UNAME_OUTPUT" MATCHES "^.*i?86.*$")
-        endif("UNAME_OUTPUT" MATCHES "^.*i[0123]86.*$")
-    endif(UNAME_EXECUTABLE)
-endif(CMAKE_COMPILER_IS_GNUCC AND NOT DBUS_ENABLE_ANSI)
+            endif()
+        endif()
+    endif()
+endif()
 
 if(X11_FOUND)
   option(DBUS_BUILD_X11 "Build with X11 autolaunch support " ON)
-endif(X11_FOUND)
+endif()
 
 # test binary names
 if(WIN32)
     # follow Automake's naming convention so we can share .in files
     set(EXEEXT ${CMAKE_EXECUTABLE_SUFFIX})
-endif(WIN32)
+endif()
 
 if(MSVC_IDE)
     if(CMAKE_BUILD_TYPE MATCHES Debug)
@@ -414,10 +414,10 @@ if(MSVC_IDE)
         message(STATUS "To run tests with 'Debug' configuration use -DCMAKE_BUILD_TYPE=Debug")
         message(STATUS "Add '..\\..\\test\\data' to the command line option of the test programs")
         message(STATUS)
-    endif(CMAKE_BUILD_TYPE MATCHES Debug)
+    endif()
     set(TEST_PATH_FORCE FORCE)
     file(REMOVE ${CMAKE_BINARY_DIR}/data/dbus-1/services)
-endif(MSVC_IDE)
+endif()
 
 #### Find socket directories
 if(UNIX)
@@ -469,7 +469,7 @@ else(WIN32)
   # For best security, assume that all non-Windows platforms can do
   # credentials-passing.
   set(DBUS_SESSION_CONF_MAYBE_AUTH_EXTERNAL "<auth>EXTERNAL</auth>")
-endif(WIN32)
+endif()
 
 set(DBUS_DAEMON_NAME "dbus-daemon" CACHE STRING "The name of the dbus daemon executable")
 
@@ -503,8 +503,8 @@ if(DBUS_BUILD_TESTS)
     endif()
     if(WIN32)
         set(TEST_LISTEN "tcp:host=localhost")
-    endif(WIN32)
-endif(DBUS_BUILD_TESTS)
+    endif()
+endif()
 
 set(DBUS_LIBRARIES dbus-1)
 set(DBUS_INTERNAL_LIBRARIES dbus-internal)
@@ -548,7 +548,7 @@ if(DBUS_BUILD_TESTS)
     add_custom_target(check
         COMMAND ctest -R ^test-.*
     )
-endif(DBUS_BUILD_TESTS)
+endif()
 add_subdirectory( tools )
 add_subdirectory( doc )
 
@@ -625,32 +625,32 @@ endif()
 message("        Test listen address:      ${TEST_LISTEN}                      ")
 if(MSVC)
 message("        build timestamp:          ${DBUS_BUILD_TIMESTAMP}             ")
-endif(MSVC)
+endif()
 
 message(" ")
 if(DBUS_BUILD_TESTS)
     message("NOTE: building with unit tests increases the size of the installed library and renders it insecure.")
-endif(DBUS_BUILD_TESTS)
+endif()
 
 if(DBUS_BUILD_TESTS AND DBUS_DISABLE_ASSERT)
     message("NOTE: building with unit tests but without assertions means tests may not properly report failures (this configuration is only useful when doing something like profiling the tests)")
-endif(DBUS_BUILD_TESTS AND DBUS_DISABLE_ASSERT)
+endif()
 
 if(DBUS_GCOV_ENABLED)
     message("NOTE: building with coverage profiling is definitely for developers only.")
-endif(DBUS_GCOV_ENABLED)
+endif()
 
 if(DBUS_ENABLE_VERBOSE_MODE)
     message("NOTE: building with verbose mode increases library size, may slightly increase security risk, and decreases performance.")
-endif(DBUS_ENABLE_VERBOSE_MODE)
+endif()
 
 if(NOT DBUS_DISABLE_ASSERT)
     message("NOTE: building with assertions increases library size and decreases performance.")
-endif(NOT DBUS_DISABLE_ASSERT)
+endif()
 
 if(DBUS_DISABLE_CHECKS)
     message("NOTE: building without checks for arguments passed to public API makes it harder to debug apps using D-BUS, but will slightly decrease D-BUS library size and _very_ slightly improve performance.")
-endif(DBUS_DISABLE_CHECKS)
+endif()
 
 foreach(_note ${FOOTNOTES})
     message(${_note})
diff --git a/bus/CMakeLists.txt b/bus/CMakeLists.txt
index 180c7d43..28b81f81 100644
--- a/bus/CMakeLists.txt
+++ b/bus/CMakeLists.txt
@@ -21,9 +21,9 @@ foreach(FILE ${FILES})
     set(TARGET ${CMAKE_BINARY_DIR}/data/dbus-1/services/${FILENAME}.service)
     if(CONFIG_VERBOSE)
         message("FROM: ${FILE}\nTO: ${TARGET}\n")
-    endif(CONFIG_VERBOSE)
+    endif()
     configure_file(${FILE} ${TARGET} )
-endforeach(FILE)
+endforeach()
 
 
 if(DBUS_BUS_ENABLE_INOTIFY)
@@ -32,7 +32,7 @@ elseif(DBUS_BUS_ENABLE_KQUEUE)
     set(DIR_WATCH_SOURCE dir-watch-kqueue.c)
 else(DBUS_BUS_ENABLE_INOTIFY)
     set(DIR_WATCH_SOURCE dir-watch-default.c)
-endif(DBUS_BUS_ENABLE_INOTIFY)
+endif()
 
 set(BUS_SOURCES
     activation.c
@@ -81,7 +81,7 @@ if(DBUS_ENABLE_STATS)
         stats.c
         stats.h
     )
-endif(DBUS_ENABLE_STATS)
+endif()
 
 include_directories(
     ${CMAKE_BINARY_DIR}
@@ -128,7 +128,7 @@ if(DBUS_SERVICE)
     target_link_libraries(dbus-service ${DBUS_INTERNAL_LIBRARIES} ${EXPAT_LIBRARIES})
     set_target_properties(dbus-service PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
     install(TARGETS dbus-service ${INSTALL_TARGETS_DEFAULT_ARGS})
-endif(DBUS_SERVICE)
+endif()
 
 set(LAUNCH_HELPER_SOURCES
     config-loader-expat.c
@@ -144,11 +144,11 @@ if(NOT WIN32)
 
     add_executable(dbus-daemon-launch-helper activation-helper.c activation-helper-bin.c )
     target_link_libraries(dbus-daemon-launch-helper launch-helper-internal)
-endif(NOT WIN32)
+endif()
 
 if(MSVC)
     project_source_group(${GROUP_CODE} bus_test_SOURCES dummy)
-endif(MSVC)
+endif()
 
 ## mop up the gcov files
 #clean-local:
diff --git a/cmake/modules/CPackInstallConfig.cmake b/cmake/modules/CPackInstallConfig.cmake
index 06632ba8..221a7938 100644
--- a/cmake/modules/CPackInstallConfig.cmake
+++ b/cmake/modules/CPackInstallConfig.cmake
@@ -3,9 +3,9 @@ if(DBUS_INSTALL_SYSTEM_LIBS)
     if(MINGW)
     else(MINGW)
         include(InstallRequiredSystemLibraries)
-    endif(MINGW)
+    endif()
         install(FILES ${LIBEXPAT_LIBRARIES} DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif(DBUS_INSTALL_SYSTEM_LIBS)
+endif()
 
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "D-BUS For Windows")
 set(CPACK_PACKAGE_VENDOR "D-BUS Windows Team")
diff --git a/cmake/modules/MacroGetenvWinPath.cmake b/cmake/modules/MacroGetenvWinPath.cmake
index 4a020a3d..345c29e4 100644
--- a/cmake/modules/MacroGetenvWinPath.cmake
+++ b/cmake/modules/MacroGetenvWinPath.cmake
@@ -2,4 +2,4 @@
 macro(MACRO_GETENV_WIN_PATH var name)
     set(${var} $ENV{${name}})
     string(REGEX REPLACE "\\\\" "/" ${var} "${${var}}")
-endmacro(MACRO_GETENV_WIN_PATH var name)
+endmacro()
diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt
index 268112f2..29630b4e 100644
--- a/dbus/CMakeLists.txt
+++ b/dbus/CMakeLists.txt
@@ -69,7 +69,7 @@ else(UNIX)
         dbus-transport-win.c
         dbus-server-win.c
     )
-endif(UNIX)
+endif()
 
 set(DBUS_LIB_HEADERS
     dbus-auth.h
@@ -106,7 +106,7 @@ else(UNIX)
     set(DBUS_LIB_HEADERS ${DBUS_LIB_HEADERS}
         dbus-transport-win.h
     )
-endif(UNIX)
+endif()
 
 
 ### source code that goes in the installed client library
@@ -192,7 +192,7 @@ if(WIN32)
     set(DBUS_SHARED_HEADERS ${DBUS_SHARED_HEADERS}
         dbus-sysdeps-wince-glue.h
     )
-    endif(WINCE)
+    endif()
 else(WIN32)
     set(DBUS_SHARED_SOURCES ${DBUS_SHARED_SOURCES}
         dbus-file-unix.c
@@ -212,7 +212,7 @@ else(WIN32)
         dbus-userdb-util.c
         dbus-sysdeps-util-unix.c
     )
-endif(WIN32)
+endif()
 
 if(DBUS_HAVE_LINUX_EPOLL)
         set(DBUS_UTIL_SOURCES
@@ -243,7 +243,7 @@ if(MSVC_IDE)
     project_source_group(${GROUP_CODE} DBUS_LIB_SOURCES DBUS_LIB_HEADERS)
     project_source_group(${GROUP_CODE} DBUS_SHARED_SOURCES DBUS_SHARED_HEADERS)
     project_source_group(${GROUP_CODE} DBUS_UTIL_SOURCES DBUS_UTIL_SOURCES)
-endif(MSVC_IDE)
+endif()
 
 # for clock_getres() on e.g. GNU/Linux (but not Android)
 find_library(LIBRT rt)
@@ -270,7 +270,7 @@ if(WIN32)
         target_link_libraries(dbus-1 ws2)
     else(WINCE)
         target_link_libraries(dbus-1 ws2_32 advapi32 netapi32 iphlpapi dbghelp)
-    endif(WINCE)
+    endif()
 else(WIN32)
     if(DEFINED DBUS_LIBRARY_REVISION)
         set_target_properties(dbus-1 PROPERTIES VERSION ${DBUS_LIBRARY_MAJOR}.${DBUS_LIBRARY_AGE}.${DBUS_LIBRARY_REVISION} SOVERSION ${DBUS_LIBRARY_MAJOR})
@@ -282,14 +282,14 @@ else(WIN32)
     if(LIBSOCKET)
         target_link_libraries(dbus-1 ${LIBSOCKET})
     endif()
-endif(WIN32)
+endif()
 
 # Assume that Linux has -Wl,--version-script and other platforms do not
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
     set(SOVERSION ${DBUS_LIBRARY_MAJOR})
     configure_file(Version.in ${CMAKE_CURRENT_BINARY_DIR}/Version)
     set_target_properties(dbus-1 PROPERTIES LINK_FLAGS -Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/Version)
-endif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+endif()
 
 install(TARGETS dbus-1 ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES ${dbusinclude_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dbus-1.0/dbus)
@@ -307,7 +307,7 @@ if(WIN32)
         target_link_libraries(dbus-internal ws2)
     else(WINCE)
         target_link_libraries(dbus-internal ws2_32 advapi32 netapi32 iphlpapi)
-    endif(WINCE)
+    endif()
 else(WIN32)
     target_link_libraries(dbus-internal ${CMAKE_THREAD_LIBS_INIT})
     if(LIBRT)
@@ -316,11 +316,11 @@ else(WIN32)
     if(LIBSOCKET)
         target_link_libraries(dbus-internal ${LIBSOCKET})
     endif()
-endif(WIN32)
+endif()
 
 if(UNIX)
 # set version info
-endif(UNIX)
+endif()
 
 
 ## mop up the gcov files
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 0447f9fb..d87f14ef 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -8,7 +8,7 @@ add_custom_target(doc ALL)
 
 if(DOXYGEN_EXECUTABLE)
   option(DBUS_ENABLE_DOXYGEN_DOCS "build DOXYGEN documentation (requires Doxygen)" ON)
-endif(DOXYGEN_EXECUTABLE)
+endif()
 
 if(DBUS_ENABLE_DOXYGEN_DOCS)
     set(top_srcdir ${CMAKE_SOURCE_DIR})
@@ -28,7 +28,7 @@ if(DBUS_ENABLE_DOXYGEN_DOCS)
     )
     add_dependencies(doc devhelp2)
     install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/api/html/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/dbus/api)
-endif(DBUS_ENABLE_DOXYGEN_DOCS)
+endif()
 
 find_program(XSLTPROC_EXECUTABLE xsltproc)
 if(XSLTPROC_EXECUTABLE)
@@ -89,7 +89,7 @@ macro(DOCBOOK _sources _format)
     else()
         message(STATUS "skipping xml doc generating for ${_infile}, file not found")
     endif()
-endmacro(DOCBOOK)
+endmacro()
 
 ### copy tests to builddir so that generated tests and static tests 
 ### are all in one place.
@@ -105,11 +105,11 @@ macro(COPYDIR _src _type)
                 configure_file(${FILE} ${TARGET} COPYONLY)
                 if(CONFIG_VERBOSE)
                     message("FROM: ${FILE}\nTO: ${TARGET}\n")
-                endif(CONFIG_VERBOSE)
-            endforeach(FILE)
-        endforeach(DIR)
-    endforeach(FILE_TYPE)
-endmacro(COPYDIR)
+                endif()
+            endforeach()
+        endforeach()
+    endforeach()
+endmacro()
 
 COPYDIR(doc *.png)
 COPYDIR(doc *.svg)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index bd24d61a..2b348a4f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -211,7 +211,7 @@ set(CONFIG_VERBOSE 1)
 
 foreach(DIR ${TESTDIRS})
     file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DIR})
-endforeach(DIR)
+endforeach()
 
 ### copy tests to builddir so that generated tests and static tests 
 ### are all in one place.
@@ -225,10 +225,10 @@ foreach(FILE_TYPE *.message-raw *.auth-script *.sha1 *.txt *.conf *.service)
             configure_file(${FILE} ${TARGET} COPYONLY)
             if(CONFIG_VERBOSE)
                 message("${FILE}")
-            endif(CONFIG_VERBOSE)
-        endforeach(FILE)
-    endforeach(DIR)
-endforeach(FILE_TYPE)
+            endif()
+        endforeach()
+    endforeach()
+endforeach()
 
 ### generate test files
 message(STATUS "Generating test files from templates into test directory")
@@ -243,10 +243,10 @@ foreach(FILE_TYPE *.conf.in *.service.in)
       configure_file(${FILE} ${TARGET} @ONLY IMMEDIATE)
       if(CONFIG_VERBOSE)
         message("${FILE}")
-      endif(CONFIG_VERBOSE)
-    endforeach(FILE)
-  endforeach(DIR)
-endforeach(FILE_TYPE)
+      endif()
+    endforeach()
+  endforeach()
+endforeach()
 
 message(STATUS "Copying generated bus config files to test directory")
 configure_file(../bus/session.conf.in ${CMAKE_BINARY_DIR}/test/data/valid-config-files/session.conf @ONLY)
diff --git a/test/name-test/CMakeLists.txt b/test/name-test/CMakeLists.txt
index 45ceb6c7..dabf892a 100644
--- a/test/name-test/CMakeLists.txt
+++ b/test/name-test/CMakeLists.txt
@@ -10,4 +10,4 @@ add_session_test_executable(test-pending-call-dispatch test-pending-call-dispatc
 add_session_test_executable(test-pending-call-timeout test-pending-call-timeout.c ${DBUS_INTERNAL_LIBRARIES})
 add_session_test_executable(test-shutdown test-shutdown.c dbus-testutils)
 add_session_test_executable(test-thread-init test-threads-init.c ${DBUS_INTERNAL_LIBRARIES})
-endif(DBUS_ENABLE_EMBEDDED_TESTS)
+endif()
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 8f499fe1..16a0c450 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -41,14 +41,14 @@ set(dbus_launch_SOURCES
     tool-common.c
     tool-common.h
 )
-endif(WIN32)
+endif()
 
 if(DBUS_BUILD_X11)
 set(dbus_launch_SOURCES
      ${dbus_launch_SOURCES}
      dbus-launch-x11.c
 )
-endif(DBUS_BUILD_X11)
+endif()
 
 set(dbus_cleanup_sockets_SOURCES
     dbus-cleanup-sockets.c
@@ -92,7 +92,7 @@ add_executable(dbus-launch ${dbus_launch_SOURCES})
 target_link_libraries(dbus-launch ${DBUS_LIBRARIES})
 if(DBUS_BUILD_X11)
   target_link_libraries(dbus-launch ${X11_LIBRARIES} )
-endif(DBUS_BUILD_X11)
+endif()
 install(TARGETS dbus-launch ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 if(WIN32)