Missed format

microsoft · Jul 11, 2024 · 7009892 · 7009892
1 parent 96f650c
commit 7009892
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -263,7 +263,9 @@ else()
   list(APPEND CCHOST_SOURCES src/host/snmalloc.cpp)
 endif()
 
-list(APPEND CCHOST_SOURCES ${CCF_DIR}/src/host/main.cpp ${CCF_DIR}/src/ds/nonstd.cpp)
+list(APPEND CCHOST_SOURCES ${CCF_DIR}/src/host/main.cpp
+     ${CCF_DIR}/src/ds/nonstd.cpp
+)
 
 if(COMPILE_TARGET STREQUAL "sgx")
   list(APPEND CCHOST_SOURCES ${CCF_GENERATED_DIR}/ccf_u.cpp)
@@ -615,7 +617,8 @@ add_custom_target(ccf ALL)
 
 set(CCF_IMPL_SOURCE
     ${CCF_DIR}/src/enclave/main.cpp ${CCF_DIR}/src/enclave/enclave_time.cpp
-    ${CCF_DIR}/src/enclave/thread_local.cpp ${CCF_DIR}/src/node/quote.cpp ${CCF_DIR}/src/ds/nonstd.cpp
+    ${CCF_DIR}/src/enclave/thread_local.cpp ${CCF_DIR}/src/node/quote.cpp
+    ${CCF_DIR}/src/ds/nonstd.cpp
 )
 
 if(COMPILE_TARGET STREQUAL "sgx")
@@ -1083,9 +1086,7 @@ if(BUILD_TESTS)
     )
 
     # Merkle Tree memory test
-    add_executable(merkle_mem src/node/test/merkle_mem.cpp
-    src/ds/nonstd.cpp
-    )
+    add_executable(merkle_mem src/node/test/merkle_mem.cpp src/ds/nonstd.cpp)
     target_compile_options(merkle_mem PRIVATE ${COMPILE_LIBCXX})
     target_link_libraries(
       merkle_mem PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${LINK_LIBCXX}
@@ -1095,9 +1096,7 @@ if(BUILD_TESTS)
     # Raft driver and scenario test
     add_executable(
       raft_driver ${CMAKE_CURRENT_SOURCE_DIR}/src/consensus/aft/test/driver.cpp
-                  src/enclave/thread_local.cpp
-    src/ds/nonstd.cpp
-
+                  src/enclave/thread_local.cpp src/ds/nonstd.cpp
     )
     target_link_libraries(raft_driver PRIVATE ccfcrypto.host)
     target_include_directories(raft_driver PRIVATE src/aft)

diff --git a/cmake/common.cmake b/cmake/common.cmake
@@ -3,9 +3,10 @@
 
 # Unit test wrapper
 function(add_unit_test name)
-  add_executable(${name} ${CCF_DIR}/src/enclave/thread_local.cpp 
-    ${CCF_DIR}/src/ds/nonstd.cpp
-  ${ARGN})
+  add_executable(
+    ${name} ${CCF_DIR}/src/enclave/thread_local.cpp
+            ${CCF_DIR}/src/ds/nonstd.cpp ${ARGN}
+  )
   target_compile_options(${name} PRIVATE ${COMPILE_LIBCXX})
   target_include_directories(
     ${name} PRIVATE src ${CCFCRYPTO_INC} ${CCF_DIR}/3rdparty/test
@@ -351,9 +352,7 @@ function(add_picobench name)
     PARSE_ARGV 1 PARSED_ARGS "" "" "SRCS;INCLUDE_DIRS;LINK_LIBS"
   )
 
-  add_executable(${name} 
-  src/ds/nonstd.cpp
-  ${PARSED_ARGS_SRCS})
+  add_executable(${name} src/ds/nonstd.cpp ${PARSED_ARGS_SRCS})
 
   target_include_directories(${name} PRIVATE src ${PARSED_ARGS_INCLUDE_DIRS})
 

diff --git a/tests/perf-system/submitter/CMakeLists.txt b/tests/perf-system/submitter/CMakeLists.txt
@@ -2,8 +2,7 @@ set(SUBMITTER_DIR ${CCF_DIR}/tests/perf-system/submitter)
 
 add_executable(
   submit ${SUBMITTER_DIR}/submit.cpp ${SUBMITTER_DIR}/handle_arguments.h
-         ${SUBMITTER_DIR}/parquet_data.h
-         ${CCF_DIR}/src/ds/nonstd.cpp
+         ${SUBMITTER_DIR}/parquet_data.h ${CCF_DIR}/src/ds/nonstd.cpp
 )
 
 add_library(stdcxxhttp_parser.host "${HTTP_PARSER_SOURCES}")