From a9abeea8e3411fc15bd8a5471089b04b99a44fad Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 2 Feb 2020 19:50:35 +0100 Subject: [PATCH] Apply cmake-format 0.6.8 --- connector/CMakeLists.txt | 28 ++++++++++++++-------------- libsyncthing/CMakeLists.txt | 14 ++++++-------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/connector/CMakeLists.txt b/connector/CMakeLists.txt index 2aaa634..bdb5cf5 100644 --- a/connector/CMakeLists.txt +++ b/connector/CMakeLists.txt @@ -58,8 +58,14 @@ else () endif () option(SYSTEMD_SUPPORT "enables support for controlling Syncthing systemd service" ${ENABLE_SYSTEMD_SUPPORT_BY_DEFAULT}) if (SYSTEMD_SUPPORT) - list(APPEND DBUS_FILES org.freedesktop.DBus.Properties.xml org.freedesktop.login1.LoginManager.xml - org.freedesktop.systemd1.Manager.xml org.freedesktop.systemd1.Service.xml org.freedesktop.systemd1.Unit.xml) + list( + APPEND + DBUS_FILES + org.freedesktop.DBus.Properties.xml + org.freedesktop.login1.LoginManager.xml + org.freedesktop.systemd1.Manager.xml + org.freedesktop.systemd1.Service.xml + org.freedesktop.systemd1.Unit.xml) set_source_files_properties(org.freedesktop.systemd1.Manager.xml PROPERTIES INCLUDE syncthingservice.h) list(APPEND META_PUBLIC_COMPILE_DEFINITIONS ${META_PROJECT_VARNAME_UPPER}_SUPPORT_SYSTEMD) message(STATUS "systemd support enabled") @@ -83,20 +89,16 @@ endif () # configure whether the service should be mocked for test purposes option(SYNCTHING_SERVICE_MOCKED "enables mocking the SyncthingService class so it will provide some fake status" OFF) if (SYNCTHING_SERVICE_MOCKED) - set_property( - SOURCE syncthingservice.cpp - APPEND - PROPERTY COMPILE_DEFINITIONS ${META_PROJECT_VARNAME_UPPER}_SERVICE_MOCKED) + set_property(SOURCE syncthingservice.cpp APPEND PROPERTY COMPILE_DEFINITIONS + ${META_PROJECT_VARNAME_UPPER}_SERVICE_MOCKED) message(WARNING "SyncthingService class will be mocked") endif () # configure whether events should be logged option(SYNCTHING_CONNECTION_LOG_SYNCTHING_EVENTS "enables logging event data to stdout (enable only for debugging!)" OFF) if (SYNCTHING_CONNECTION_LOG_SYNCTHING_EVENTS) - set_property( - SOURCE syncthingconnection.cpp syncthingconnection_requests.cpp - APPEND - PROPERTY COMPILE_DEFINITIONS ${META_PROJECT_VARNAME_UPPER}_LOG_SYNCTHING_EVENTS) + set_property(SOURCE syncthingconnection.cpp syncthingconnection_requests.cpp APPEND + PROPERTY COMPILE_DEFINITIONS ${META_PROJECT_VARNAME_UPPER}_LOG_SYNCTHING_EVENTS) message(WARNING "SyncthingConnection class will log event data to stdout") endif () @@ -104,10 +106,8 @@ endif () option(SYNCTHING_CONNECTION_LOG_API_CALLS "enables logging API calls done by the SyncthingConnector (enable only for debugging!)" OFF) if (SYNCTHING_CONNECTION_LOG_API_CALLS) - set_property( - SOURCE syncthingconnection_requests.cpp - APPEND - PROPERTY COMPILE_DEFINITIONS ${META_PROJECT_VARNAME_UPPER}_LOG_API_CALLS) + set_property(SOURCE syncthingconnection_requests.cpp APPEND PROPERTY COMPILE_DEFINITIONS + ${META_PROJECT_VARNAME_UPPER}_LOG_API_CALLS) message(WARNING "SyncthingConnection class will log API calls data to stdout") endif () diff --git a/libsyncthing/CMakeLists.txt b/libsyncthing/CMakeLists.txt index 957ac4d..1b2e304 100644 --- a/libsyncthing/CMakeLists.txt +++ b/libsyncthing/CMakeLists.txt @@ -124,8 +124,8 @@ endif () # generate Syncthing's assets: don't set GOARCH/GOOS here, this is supposed to run on the host add_custom_command( OUTPUT "${SYNCTHING_PATH}/lib/auto/gui.files.go" - COMMAND - "GOPATH=${GO_DEVELOPMENT_PATH}" "GO111MODULE=on" "${GO_BIN}" run ./script/genassets.go gui > lib/auto/gui.files.go + COMMAND "GOPATH=${GO_DEVELOPMENT_PATH}" "GO111MODULE=on" "${GO_BIN}" run ./script/genassets.go gui > + lib/auto/gui.files.go DEPENDS ${SRC_FILES_SYNCTHING_ASSETS} WORKING_DIRECTORY "${SYNCTHING_PATH}" COMMENT "Building Syncthing's assets") @@ -149,7 +149,7 @@ find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED) list(APPEND CMAKE_MODULE_PATH ${CPP_UTILITIES_MODULE_DIRS}) if (CPP_UTILITIES_SOURCE_DIR) list(APPEND PRIVATE_INCLUDE_DIRS $ - $) + $) else () list(APPEND PRIVATE_INCLUDE_DIRS ${CPP_UTILITIES_INCLUDE_DIRS}) endif () @@ -170,15 +170,13 @@ elseif (UNIX) endif () foreach (LIBRARY ${SYNCTHING_INTERNAL_LIBS}) find_library(SYNCTHING_INTERNAL_LIBRARY_PATH_${LIBRARY} ${LIBRARY}) - set_property( - TARGET syncthinginternal - APPEND - PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES ${SYNCTHING_INTERNAL_LIBRARY_PATH_${LIBRARY}}) + set_property(TARGET syncthinginternal APPEND PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES + ${SYNCTHING_INTERNAL_LIBRARY_PATH_${LIBRARY}}) endforeach () # depend on that imported target list(APPEND PRIVATE_LIBRARIES $ - $) + $) # include modules to apply configuration include(WindowsResources)