summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2019-01-23 21:26:22 +0100
committerRalf Habacker <ralf.habacker@freenet.de>2019-01-23 21:34:24 +0100
commit54800ede4ed089c4d7c122528001615289581ab8 (patch)
tree965fceedf0a614541d371f37e92b94682526173f /cmake
parent382857a2654acc269e82dd355463612d62cd5a79 (diff)
downloaddbus-54800ede4ed089c4d7c122528001615289581ab8.tar.gz
Remove obsolete parameter in end... cmake keywords
Diffstat (limited to 'cmake')
-rw-r--r--cmake/ConfigureChecks.cmake6
-rw-r--r--cmake/modules/CPackInstallConfig.cmake2
-rw-r--r--cmake/modules/Macros.cmake6
-rw-r--r--cmake/modules/MacrosAutotools.cmake4
-rw-r--r--cmake/modules/ProjectSourceGroup.cmake6
-rw-r--r--cmake/modules/Win32Macros.cmake10
6 files changed, 17 insertions, 17 deletions
diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index b64a7d3f..27cd986d 100644
--- 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 6bac749a..c715871a 100644
--- 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 8397bcf0..33fbcbb2 100644
--- 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 147d19b0..ab4f1c1b 100644
--- 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 a9b3e0ad..9cfec3d9 100644
--- 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 c8402e49..0946b037 100644
--- 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()