summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2019-01-24 08:59:53 +0100
committerRalf Habacker <ralf.habacker@freenet.de>2019-01-24 09:08:15 +0100
commit6332f7d4b17138015fc5f61488cd0e20b5ab1c3b (patch)
tree572ea734e9e92785d5c3f0454b79d57c1f3e7ab9
parent2798e68776e4325267ae6247103df047a1c9dd46 (diff)
downloaddbus-6332f7d4b17138015fc5f61488cd0e20b5ab1c3b.tar.gz
Fixes remaining indentations that are not covered by the cmake formatting script in CMakeLists.txt files
-rw-r--r--CMakeLists.txt19
-rw-r--r--bus/CMakeLists.txt8
-rw-r--r--dbus/CMakeLists.txt16
-rw-r--r--test/CMakeLists.txt52
4 files changed, 52 insertions, 43 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8085d1b..9bc10550 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -329,10 +329,10 @@ option(DBUS_DISABLE_CHECKS "Disable public API sanity checking" OFF)
if(NOT MSVC)
option(DBUS_GCOV_ENABLED "compile with coverage profiling instrumentation (gcc only)" OFF)
if(DBUS_GCOV_ENABLED)
- add_definitions(-fprofile-arcs -ftest-coverage)
- # FIXME!!!!
- ## remove optimization
- # CFLAGS=`echo "$CFLAGS" | sed -e 's/-O[0-9]*//g'`
+ add_definitions(-fprofile-arcs -ftest-coverage)
+ # FIXME!!!!
+ ## remove optimization
+ # CFLAGS=`echo "$CFLAGS" | sed -e 's/-O[0-9]*//g'`
endif()
endif()
@@ -371,12 +371,15 @@ set(atomic_int OFF)
set(atomic_int486 OFF)
if(CMAKE_COMPILER_IS_GNUCC AND NOT DBUS_ENABLE_ANSI)
find_program(UNAME_EXECUTABLE
- NAMES uname
- PATHS /bin /usr/bin /usr/local/bin c:/Programme/MSys/bin d:/Programme/MSys/bin)
+ NAMES uname
+ PATHS /bin /usr/bin /usr/local/bin c:/Programme/MSys/bin d:/Programme/MSys/bin
+ )
if(UNAME_EXECUTABLE)
- execute_process(COMMAND ${UNAME_EXECUTABLE} "-m"
- OUTPUT_VARIABLE UNAME_OUTPUT)
+ execute_process(
+ COMMAND ${UNAME_EXECUTABLE} "-m"
+ OUTPUT_VARIABLE UNAME_OUTPUT
+ )
if("UNAME_OUTPUT" MATCHES "^.*i[0123]86.*$")
set(atomic_int ON)
diff --git a/bus/CMakeLists.txt b/bus/CMakeLists.txt
index 28b81f81..d689adf6 100644
--- a/bus/CMakeLists.txt
+++ b/bus/CMakeLists.txt
@@ -117,10 +117,10 @@ endif()
if(DBUS_SERVICE)
set(dbus_service_SOURCES
- bus-service-win.c
- # TODO: add additional files
- # service-main.c
- # ${BUS_SOURCES}
+ bus-service-win.c
+ # TODO: add additional files
+ # service-main.c
+ # ${BUS_SOURCES}
)
add_executable_version_info(dbus_service_SOURCES "dbus-service")
diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt
index 29630b4e..51b2aec6 100644
--- a/dbus/CMakeLists.txt
+++ b/dbus/CMakeLists.txt
@@ -215,10 +215,10 @@ else(WIN32)
endif()
if(DBUS_HAVE_LINUX_EPOLL)
- set(DBUS_UTIL_SOURCES
- ${DBUS_UTIL_SOURCES}
- dbus-pollable-set-epoll.c
- )
+ set(DBUS_UTIL_SOURCES
+ ${DBUS_UTIL_SOURCES}
+ dbus-pollable-set-epoll.c
+ )
endif()
set(libdbus_SOURCES
@@ -253,8 +253,8 @@ find_library(LIBSOCKET socket)
### Client library
add_library(dbus-1 SHARED
- ${libdbus_SOURCES}
- ${libdbus_HEADERS}
+ ${libdbus_SOURCES}
+ ${libdbus_HEADERS}
)
if(WIN32)
@@ -298,8 +298,8 @@ install(FILES ${dbusinclude_ARCH_HEADERS} DESTINATION ${CMAKE_INSTALL_LIBDIR}/db
### Internal library, used for the daemon, tools and tests, compiled statically.
add_library(dbus-internal ${DBUS_INTERNAL_ADD_LIBRARY_OPTIONS}
- ${DBUS_UTIL_SOURCES}
- ${DBUS_UTIL_HEADERS}
+ ${DBUS_UTIL_SOURCES}
+ ${DBUS_UTIL_HEADERS}
)
target_link_libraries(dbus-internal dbus-1)
if(WIN32)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 959bb982..2b8db2f6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -36,7 +36,7 @@ set(test-shell-service_SOURCES
)
set(test-shell_SOURCES
- shell-test.c
+ shell-test.c
)
set(test-spawn_SOURCES
@@ -95,34 +95,40 @@ if(DBUS_ENABLE_EMBEDDED_TESTS)
add_test_executable(test-hash internals/hash.c dbus-testutils)
set_target_properties(test-hash PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
- set(SOURCES internals/dbus-marshal-recursive-util.c
- internals/dbus-marshal-recursive-util.h
- internals/marshal-recursive.c)
+ set(SOURCES
+ internals/dbus-marshal-recursive-util.c
+ internals/dbus-marshal-recursive-util.h
+ internals/marshal-recursive.c
+ )
add_test_executable(test-marshal-recursive "${SOURCES}" dbus-testutils)
set_target_properties(test-marshal-recursive PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
- set(SOURCES internals/dbus-marshal-recursive-util.c
- internals/dbus-marshal-recursive-util.h
- internals/dbus-message-factory.c
- internals/dbus-message-factory.h
- internals/dbus-message-util.c
- internals/dbus-message-util.h
- internals/message-internals.c)
+ set(SOURCES
+ internals/dbus-marshal-recursive-util.c
+ internals/dbus-marshal-recursive-util.h
+ internals/dbus-message-factory.c
+ internals/dbus-message-factory.h
+ internals/dbus-message-util.c
+ internals/dbus-message-util.h
+ internals/message-internals.c
+ )
add_test_executable(test-message-internals "${SOURCES}" dbus-testutils)
set_target_properties(test-message-internals PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
- set(SOURCES internals/dbus-auth-script.c
- internals/dbus-auth-script.h
- internals/dbus-auth-util.c
- internals/dbus-credentials-util.c
- internals/dbus-marshal-byteswap-util.c
- internals/dbus-marshal-recursive-util.c
- internals/dbus-marshal-recursive-util.h
- internals/dbus-marshal-validate-util.c
- internals/dbus-string-util.c
- internals/dbus-sysdeps-util.c
- internals/misc-internals.c
- internals/misc-internals.h)
+ set(SOURCES
+ internals/dbus-auth-script.c
+ internals/dbus-auth-script.h
+ internals/dbus-auth-util.c
+ internals/dbus-credentials-util.c
+ internals/dbus-marshal-byteswap-util.c
+ internals/dbus-marshal-recursive-util.c
+ internals/dbus-marshal-recursive-util.h
+ internals/dbus-marshal-validate-util.c
+ internals/dbus-string-util.c
+ internals/dbus-sysdeps-util.c
+ internals/misc-internals.c
+ internals/misc-internals.h
+ )
add_test_executable(test-misc-internals "${SOURCES}" dbus-testutils)
set_target_properties(test-misc-internals PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})