dangle parenthesistemp/test-cmake-formatting

8 files changed, 79 insertions, 40 deletions

diff --git a/.cmake-format.json b/.cmake-format.json
index 5c7e981e..b819f8cd 100644
--- a/.cmake-format.json
+++ b/.cmake-format.json
@@ -9,7 +9,7 @@
 		"max_rows_cmdline": 2,
 		"separate_ctrl_name_with_space": false,
 		"separate_fn_name_with_space": false,
-		"dangle_parens": false,
+		"dangle_parens": true,
 		"dangle_align": "child",
 		"min_prefix_chars": 4,
 		"max_prefix_chars": 10,
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0516d098..ab461ae2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,14 +3,16 @@ cmake_minimum_required(VERSION 3.15)
 project(
     Northstar
     CXX
-    ASM_MASM)
+    ASM_MASM
+    )
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE
         "Release"
         CACHE STRING
               "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
-              FORCE)
+              FORCE
+        )
 endif()
 
 # Language specs
@@ -31,7 +33,8 @@ message(STATUS "NS: Building to ${NS_BINARY_DIR}")
 list(
     APPEND
     CMAKE_MODULE_PATH
-    "${CMAKE_CURRENT_SOURCE_DIR}/primedev/cmake")
+    "${CMAKE_CURRENT_SOURCE_DIR}/primedev/cmake"
+    )
 include(utils)
 
 include_directories(primedev)
diff --git a/primedev/Launcher.cmake b/primedev/Launcher.cmake
index 659d4791..c04fc70b 100644
--- a/primedev/Launcher.cmake
+++ b/primedev/Launcher.cmake
@@ -19,7 +19,10 @@ target_link_libraries(
             uuid.lib
             odbc32.lib
             odbccp32.lib
-            WS2_32.lib)
+            WS2_32.lib
+    )
 
-set_target_properties(NorthstarLauncher PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${NS_BINARY_DIR}
-                                                   LINK_FLAGS "/MANIFEST:NO /DEBUG /STACK:8000000")
+set_target_properties(
+    NorthstarLauncher PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${NS_BINARY_DIR} LINK_FLAGS
+                                                                           "/MANIFEST:NO /DEBUG /STACK:8000000"
+    )
diff --git a/primedev/Northstar.cmake b/primedev/Northstar.cmake
index 39e2aa28..50b6adfd 100644
--- a/primedev/Northstar.cmake
+++ b/primedev/Northstar.cmake
@@ -151,7 +151,8 @@ add_library(
     "util/wininfo.h"
     "dllmain.cpp"
     "dllmain.h"
-    "ns_version.h")
+    "ns_version.h"
+    )
 
 target_link_libraries(
     NorthstarDLL
@@ -165,21 +166,25 @@ target_link_libraries(
             Wldap32.lib
             Normaliz.lib
             Bcrypt.lib
-            version.lib)
+            version.lib
+    )
 
 target_precompile_headers(
     NorthstarDLL
     PRIVATE
-    pch.h)
+    pch.h
+    )
 
 target_compile_definitions(
     NorthstarDLL
     PRIVATE UNICODE
             _UNICODE
-            CURL_STATICLIB)
+            CURL_STATICLIB
+    )
 
 set_target_properties(
     NorthstarDLL
     PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${NS_BINARY_DIR}
                OUTPUT_NAME Northstar
-               LINK_FLAGS "/MANIFEST:NO /DEBUG")
+               LINK_FLAGS "/MANIFEST:NO /DEBUG"
+    )
diff --git a/primedev/WSockProxy.cmake b/primedev/WSockProxy.cmake
index 0629adb2..017e358a 100644
--- a/primedev/WSockProxy.cmake
+++ b/primedev/WSockProxy.cmake
@@ -8,7 +8,8 @@ add_library(
     "wsockproxy/loader.cpp"
     "wsockproxy/loader.h"
     "wsockproxy/wsock32.asm"
-    "wsockproxy/wsock32.def")
+    "wsockproxy/wsock32.def"
+    )
 
 target_link_libraries(
     loader_wsock32_proxy
@@ -29,12 +30,14 @@ target_link_libraries(
             oleaut32.lib
             uuid.lib
             odbc32.lib
-            odbccp32.lib)
+            odbccp32.lib
+    )
 
 target_precompile_headers(
     loader_wsock32_proxy
     PRIVATE
-    wsockproxy/pch.h)
+    wsockproxy/pch.h
+    )
 
 target_compile_definitions(loader_wsock32_proxy PRIVATE UNICODE _UNICODE)
 
@@ -42,4 +45,5 @@ set_target_properties(
     loader_wsock32_proxy
     PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${NS_BINARY_DIR}/bin/x64_retail
                OUTPUT_NAME wsock32
-               LINK_FLAGS "/MANIFEST:NO /DEBUG")
+               LINK_FLAGS "/MANIFEST:NO /DEBUG"
+    )
diff --git a/primedev/cmake/Findlibcurl.cmake b/primedev/cmake/Findlibcurl.cmake
index 346cd2b1..7843aae3 100644
--- a/primedev/cmake/Findlibcurl.cmake
+++ b/primedev/cmake/Findlibcurl.cmake
@@ -3,34 +3,44 @@ if(NOT libcurl_FOUND)
 
     set(BUILD_SHARED_LIBS
         OFF
-        CACHE BOOL "Build shared libraries")
+        CACHE BOOL "Build shared libraries"
+        )
     set(BUILD_CURL_EXE
         OFF
-        CACHE BOOL "Build curl EXE")
+        CACHE BOOL "Build curl EXE"
+        )
     set(HTTP_ONLY
         ON
-        CACHE BOOL "Only build HTTP and HTTPS")
+        CACHE BOOL "Only build HTTP and HTTPS"
+        )
     set(CURL_ENABLE_SSL
         ON
-        CACHE BOOL "Enable SSL support")
+        CACHE BOOL "Enable SSL support"
+        )
     set(CURL_USE_OPENSSL
         OFF
-        CACHE BOOL "Disable OpenSSL")
+        CACHE BOOL "Disable OpenSSL"
+        )
     set(CURL_USE_LIBSSH2
         OFF
-        CACHE BOOL "Disable libSSH2")
+        CACHE BOOL "Disable libSSH2"
+        )
     set(CURL_USE_SCHANNEL
         ON
-        CACHE BOOL "Enable Secure Channel")
+        CACHE BOOL "Enable Secure Channel"
+        )
     set(CURL_CA_BUNDLE
         "none"
-        CACHE STRING "Disable CA Bundle")
+        CACHE STRING "Disable CA Bundle"
+        )
     set(CURL_CA_PATH
         "none"
-        CACHE STRING "Disable CA Path")
+        CACHE STRING "Disable CA Path"
+        )
 
     add_subdirectory(${PROJECT_SOURCE_DIR}/primedev/thirdparty/libcurl libcurl)
     set(libcurl_FOUND
         1
-        PARENT_SCOPE)
+        PARENT_SCOPE
+        )
 endif()
diff --git a/primedev/cmake/Findminizip.cmake b/primedev/cmake/Findminizip.cmake
index 5bb96224..a6d0f914 100644
--- a/primedev/cmake/Findminizip.cmake
+++ b/primedev/cmake/Findminizip.cmake
@@ -3,28 +3,36 @@ if(NOT minizip_FOUND)
 
     set(MZ_ZLIB
         ON
-        CACHE BOOL "Enable ZLIB compression, needed for DEFLATE")
+        CACHE BOOL "Enable ZLIB compression, needed for DEFLATE"
+        )
     set(MZ_BZIP2
         OFF
-        CACHE BOOL "Disable BZIP2 compression")
+        CACHE BOOL "Disable BZIP2 compression"
+        )
     set(MZ_LZMA
         OFF
-        CACHE BOOL "Disable LZMA & XZ compression")
+        CACHE BOOL "Disable LZMA & XZ compression"
+        )
     set(MZ_PKCRYPT
         OFF
-        CACHE BOOL "Disable PKWARE traditional encryption")
+        CACHE BOOL "Disable PKWARE traditional encryption"
+        )
     set(MZ_WZAES
         OFF
-        CACHE BOOL "Disable WinZIP AES encryption")
+        CACHE BOOL "Disable WinZIP AES encryption"
+        )
     set(MZ_ZSTD
         OFF
-        CACHE BOOL "Disable ZSTD compression")
+        CACHE BOOL "Disable ZSTD compression"
+        )
     set(MZ_SIGNING
         OFF
-        CACHE BOOL "Disable zip signing support")
+        CACHE BOOL "Disable zip signing support"
+        )
 
     add_subdirectory(${PROJECT_SOURCE_DIR}/primedev/thirdparty/minizip minizip)
     set(minizip_FOUND
         1
-        PARENT_SCOPE)
+        PARENT_SCOPE
+        )
 endif()
diff --git a/primedev/cmake/utils.cmake b/primedev/cmake/utils.cmake
index 0255569f..80a2288d 100644
--- a/primedev/cmake/utils.cmake
+++ b/primedev/cmake/utils.cmake
@@ -3,17 +3,21 @@ function(check_init_submodule path)
     file(
         GLOB
         DIR_CONTENT
-        "${path}/*")
+        "${path}/*"
+        )
     list(
         LENGTH
         DIR_CONTENT
-        CONTENT_COUNT)
+        CONTENT_COUNT
+        )
     if(CONTENT_COUNT
        EQUAL
-       0)
+       0
+       )
         if(NOT
            EXISTS
-           "${PROJECT_SOURCE_DIR}/.git")
+           "${PROJECT_SOURCE_DIR}/.git"
+           )
             message(FATAL_ERROR "Failed to find third party dependency in '${path}'")
         endif()
 
@@ -26,12 +30,14 @@ function(check_init_submodule path)
         execute_process(
             COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-            RESULT_VARIABLE GIT_SUBMOD_RESULT)
+            RESULT_VARIABLE GIT_SUBMOD_RESULT
+            )
 
         if(NOT
            GIT_SUBMOD_RESULT
            EQUAL
-           "0")
+           "0"
+           )
             message(FATAL_ERROR "Initializing Git submodules failed with ${GIT_SUBMOD_RESULT}")
         endif()
     endif()