Remove obsolete parameter in end... cmake keywords

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index b64a7d3f81be027c6ee7e4529b47c51acb6798d6..27cd986d649cfb8d78c0be584b1a58dbe485f1ec 100644 (file)
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -186,7 +186,7 @@ elseif(SIZEOF___INT64 EQUAL 8)
     set(DBUS_UINT64_CONSTANT "(val##ui64)")
 else(SIZEOF_INT EQUAL 8)
     message(FATAL_ERROR "Could not find a 64-bit integer type")
-endif(SIZEOF_INT EQUAL 8)
+endif()
 
 # DBUS_INT32_TYPE
 if(SIZEOF_INT EQUAL 4)
@@ -195,14 +195,14 @@ elseif(SIZEOF_LONG EQUAL 4)
     set(DBUS_INT32_TYPE "long")
 elseif(SIZEOF_LONG_LONG EQUAL 4)
     set(DBUS_INT32_TYPE "long long")
-endif(SIZEOF_INT EQUAL 4)
+endif()
 
 # DBUS_INT16_TYPE
 if(SIZEOF_INT EQUAL 2)
     set(DBUS_INT16_TYPE "int")
 elseif(SIZEOF_SHORT EQUAL 2)
     set(DBUS_INT16_TYPE "short")
-endif(SIZEOF_INT EQUAL 2)
+endif()
 
 find_program(DOXYGEN doxygen)
 find_program(XMLTO xmlto)

diff --git a/cmake/modules/CPackInstallConfig.cmake b/cmake/modules/CPackInstallConfig.cmake
index 6bac749ac0f2f2c9170e16724c93717662c4cdc4..c715871ae1c29e13bb720ab6f12c06a50781b7bd 100644 (file)
--- a/cmake/modules/CPackInstallConfig.cmake
+++ b/cmake/modules/CPackInstallConfig.cmake
@@ -32,6 +32,6 @@ if(WIN32 AND NOT UNIX)
 else(WIN32 AND NOT UNIX)
   set(CPACK_STRIP_FILES "bin/MyExecutable")
   set(CPACK_SOURCE_STRIP_FILES "")
-endif(WIN32 AND NOT UNIX)
+endif()
 set(CPACK_PACKAGE_EXECUTABLES "dbus-launch" "D-Bus Daemon")
 include(CPack)

diff --git a/cmake/modules/Macros.cmake b/cmake/modules/Macros.cmake
index 8397bcf09621852e1ec429549bb2cd0d94720db7..33fbcbb231624542b453e9fb47ee634fc2172a5a 100644 (file)
--- a/cmake/modules/Macros.cmake
+++ b/cmake/modules/Macros.cmake
@@ -70,7 +70,7 @@ macro(add_test_executable _target _source)
     list(APPEND _env "DBUS_TEST_HOMEDIR=${DBUS_TEST_HOMEDIR}")
     list(APPEND _env "DBUS_TEST_UNINSTALLED=1")
     set_tests_properties(${_target} PROPERTIES ENVIRONMENT "${_env}")
-endmacro(add_test_executable)
+endmacro()
 
 macro(add_helper_executable _target _source)
     set(_sources "${_source}")
@@ -80,7 +80,7 @@ macro(add_helper_executable _target _source)
     endif()
     add_executable(${_target} ${_sources})
     target_link_libraries(${_target} ${ARGN})
-endmacro(add_helper_executable)
+endmacro()
 
 macro(add_session_test_executable _target _source)
     set(_sources "${_source}")
@@ -108,7 +108,7 @@ macro(add_session_test_executable _target _source)
     list(APPEND _env "DBUS_TEST_DATA=${DBUS_TEST_DATA}")
     list(APPEND _env "DBUS_TEST_HOMEDIR=${DBUS_TEST_HOMEDIR}")
     set_tests_properties(${_target} PROPERTIES ENVIRONMENT "${_env}")
-endmacro(add_session_test_executable)
+endmacro()
 
 #
 # generate compiler flags from MSVC warning identifiers (e.g. '4114') or gcc warning keys (e.g. 'pointer-sign')

diff --git a/cmake/modules/MacrosAutotools.cmake b/cmake/modules/MacrosAutotools.cmake
index 147d19b0bd8ffcc466fe6675afea07c3845a8591..ab4f1c1b5c8e710be116e34d9292235afab9b851 100644 (file)
--- a/cmake/modules/MacrosAutotools.cmake
+++ b/cmake/modules/MacrosAutotools.cmake
@@ -99,7 +99,7 @@ macro(autopackage name version url support_url)
 #define PACKAGE \"@PACKAGE@\"
 #define VERSION \"@VERSION@\"
 " AUTOPACKAGE_CONFIG_H_TEMPLATE)
-endmacro(autopackage)
+endmacro()
 
 #
 # define a cmake variable from autotools AC_DEFINE statement
@@ -148,7 +148,7 @@ macro(autoheaderchecks config_h_in configure_checks_file config_h_cmake)
             endif()
         endif()
     endforeach()
-endmacro(autoheaderchecks)
+endmacro()
 
 #
 # parses config.h template and create cmake equivalent 

diff --git a/cmake/modules/ProjectSourceGroup.cmake b/cmake/modules/ProjectSourceGroup.cmake
index a9b3e0ad11b47b845d24ccf964fe485803d28791..9cfec3d980ab4855147aa810a3062fd954ee02b4 100644 (file)
--- a/cmake/modules/ProjectSourceGroup.cmake
+++ b/cmake/modules/ProjectSourceGroup.cmake
@@ -12,7 +12,7 @@ macro(project_source_group mode sources headers)
     else(${mode} MATCHES "flat")
         if(NOT ${mode} MATCHES "split")
             source_group("${mode}" FILES ${${sources}} ${${headers}})
-        endif(NOT ${mode} MATCHES "split")
-    endif(${mode} MATCHES "flat")
-endmacro(project_source_group mode sources headers)
+        endif()
+    endif()
+endmacro()
 

diff --git a/cmake/modules/Win32Macros.cmake b/cmake/modules/Win32Macros.cmake
index c8402e49225a1c1d6f9d5a42f75f49ad05dd3dc4..0946b0375c79a3522984fbba2f7cc9074ba55ddb 100644 (file)
--- a/cmake/modules/Win32Macros.cmake
+++ b/cmake/modules/Win32Macros.cmake
@@ -24,7 +24,7 @@ if(WIN32)
         if(QT_QMAKE_EXECUTABLE)
             get_filename_component(QT_BIN_PATH ${QT_QMAKE_EXECUTABLE} PATH)
             set(ADD_PATH "${ADD_PATH};${QT_BIN_PATH}")
-        endif(QT_QMAKE_EXECUTABLE)
+        endif()
 
         # add here more pathes 
 
@@ -38,7 +38,7 @@ if(WIN32)
                 write_file(${CMAKE_BINARY_DIR}/${_projectname}-shell.bat "set PATH=${ADD_PATH};%PATH%\ncall \"${VC_BIN_PATH}\\vcvars32.bat\"\ncmd.exe")
             else(CMAKE_BUILD_TOOL STREQUAL  "nmake")
                 write_file(${CMAKE_BINARY_DIR}/${_projectname}-sln.bat "set PATH=${ADD_PATH};%PATH%\nstart ${_projectname}.sln")
-            endif(CMAKE_BUILD_TOOL STREQUAL  "nmake")
-        endif(MINGW)
-    endmacro(addExplorerWrapper)
-endif(WIN32)
+            endif()
+        endif()
+    endmacro()
+endif()