Skip to content

Commit 0eedd61

Browse files
author
Steven Noonan
committed
CMakeLists: normalize indentation to editorconfig, NFC
Signed-off-by: Steven Noonan <[email protected]>
1 parent 4709ced commit 0eedd61

File tree

3 files changed

+753
-753
lines changed

3 files changed

+753
-753
lines changed

examples/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ if( NOT WIN32 )
1010
set(SIGNAL_SERVER_TARGET trivial_signaling_server)
1111
set(SIGNAL_SERVER_OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/trivial_signaling_server)
1212
set(SIGNAL_SERVER_SRCS
13-
trivial_signaling_server.go
14-
)
13+
trivial_signaling_server.go
14+
)
1515
add_custom_command(
1616
OUTPUT ${SIGNAL_SERVER_OUTPUT}
1717
DEPENDS ${SIGNAL_SERVER_SRCS}
1818
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
1919
COMMENT "Building GO Trivial signaling server"
2020
COMMAND ${GO} build -o "${SIGNAL_SERVER_OUTPUT}" ${CMAKE_GO_FLAGS} ${SIGNAL_SERVER_SRCS}
21-
)
21+
)
2222
add_custom_target(${SIGNAL_SERVER_TARGET} ALL DEPENDS ${SIGNAL_SERVER_OUTPUT})
2323
endif()
2424

src/CMakeLists.txt

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set(GNS_PROTOS
1111
"common/steamnetworkingsockets_messages_certs.proto"
1212
"common/steamnetworkingsockets_messages.proto"
1313
"common/steamnetworkingsockets_messages_udp.proto"
14-
)
14+
)
1515

1616
set(GNS_SRCS
1717
"common/crypto_textencode.cpp"
@@ -38,21 +38,21 @@ set(GNS_SRCS
3838
"tier1/utlmemory.cpp"
3939
"tier1/ipv6text.c"
4040
"vstdlib/strtools.cpp"
41-
)
41+
)
4242

4343
if(USE_CRYPTO STREQUAL "BCrypt")
44-
set(GNS_CRYPTO_DEFINES ${GNS_CRYPTO_DEFINES} STEAMNETWORKINGSOCKETS_CRYPTO_BCRYPT ED25519_HASH_BCRYPT)
45-
set(GNS_SRCS ${GNS_SRCS}
46-
"common/crypto_bcrypt.cpp"
47-
)
44+
set(GNS_CRYPTO_DEFINES ${GNS_CRYPTO_DEFINES} STEAMNETWORKINGSOCKETS_CRYPTO_BCRYPT ED25519_HASH_BCRYPT)
45+
set(GNS_SRCS ${GNS_SRCS}
46+
"common/crypto_bcrypt.cpp"
47+
)
4848
endif()
4949

5050
if(USE_CRYPTO STREQUAL "OpenSSL")
51-
set(GNS_CRYPTO_DEFINES ${GNS_CRYPTO_DEFINES} STEAMNETWORKINGSOCKETS_CRYPTO_VALVEOPENSSL)
51+
set(GNS_CRYPTO_DEFINES ${GNS_CRYPTO_DEFINES} STEAMNETWORKINGSOCKETS_CRYPTO_VALVEOPENSSL)
5252
set(GNS_SRCS ${GNS_SRCS}
5353
"common/crypto_openssl.cpp"
5454
"common/opensslwrapper.cpp"
55-
)
55+
)
5656
endif()
5757

5858
if(USE_CRYPTO STREQUAL "libsodium")
@@ -66,14 +66,14 @@ if(USE_CRYPTO25519 STREQUAL "OpenSSL")
6666
set(GNS_CRYPTO_DEFINES ${GNS_CRYPTO_DEFINES} STEAMNETWORKINGSOCKETS_CRYPTO_25519_OPENSSL)
6767
set(GNS_SRCS ${GNS_SRCS}
6868
"common/crypto_25519_openssl.cpp"
69-
)
69+
)
7070
endif()
7171

7272
if(USE_CRYPTO25519 STREQUAL "libsodium")
7373
set(GNS_CRYPTO_DEFINES ${GNS_CRYPTO_DEFINES} STEAMNETWORKINGSOCKETS_CRYPTO_25519_LIBSODIUM)
7474
set(GNS_SRCS ${GNS_SRCS}
7575
"common/crypto_25519_libsodium.cpp"
76-
)
76+
)
7777
endif()
7878

7979
# Use reference 25519 crypto implementation?
@@ -85,7 +85,7 @@ if(USE_CRYPTO25519 STREQUAL "Reference")
8585
"external/curve25519-donna/curve25519_VALVE_sse2.c"
8686
"external/ed25519-donna/ed25519_VALVE.c"
8787
"external/ed25519-donna/ed25519_VALVE_sse2.c"
88-
)
88+
)
8989
endif()
9090

9191
# If WebRTC enabled, build the thin wrapper library
@@ -111,7 +111,7 @@ set(GNS_COMMON_FLAGS
111111
-Wno-unused-const-variable
112112
-Wno-nested-anon-types
113113
-Wno-format-truncation
114-
)
114+
)
115115

116116
if(USE_CRYPTO25519 STREQUAL "Reference")
117117
# We don't use some of the 25519 functions with static linkage. Silence
@@ -128,21 +128,21 @@ endif()
128128

129129
set(GNS_C_FLAGS
130130
-Wstrict-prototypes
131-
)
131+
)
132132

133133
set(GNS_CXX_FLAGS
134134
-fvisibility-inlines-hidden
135135
-Wno-reorder
136136
-Wno-non-virtual-dtor
137137
-Wno-zero-as-null-pointer-constant
138138
-fno-exceptions
139-
)
139+
)
140140

141141
if(NOT SANITIZE_UNDEFINED)
142142
set(GNS_CXX_FLAGS
143143
${GNS_CXX_FLAGS}
144144
-fno-rtti
145-
)
145+
)
146146
endif()
147147

148148
protobuf_generate_cpp(GNS_PROTO_SRCS GNS_PROTO_HDRS ${GNS_PROTOS})
@@ -155,7 +155,7 @@ macro(gamenetworkingsockets_common GNS_TARGET)
155155
target_include_directories(${GNS_TARGET} PUBLIC
156156
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>"
157157
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}/GameNetworkingSockets>"
158-
)
158+
)
159159

160160
target_include_directories(${GNS_TARGET} PRIVATE
161161
"common"
@@ -165,13 +165,13 @@ macro(gamenetworkingsockets_common GNS_TARGET)
165165
# Only necessary if we're not using protobuf::libprotobuf
166166
# But that's not supported until CMake 3.9
167167
${Protobuf_INCLUDE_DIRS}
168-
)
168+
)
169169

170170
target_link_libraries(${GNS_TARGET} PUBLIC
171171
# protobuf::libprotobuf
172172
${PROTOBUF_LIBRARIES}
173173
Threads::Threads
174-
)
174+
)
175175

176176
# Enable ICE?
177177
if(USE_STEAMWEBRTC)
@@ -184,29 +184,29 @@ macro(gamenetworkingsockets_common GNS_TARGET)
184184
if(STEAMWEBRTC_USE_STATIC_LIBS)
185185
target_compile_definitions(${GNS_TARGET} PRIVATE
186186
STEAMWEBRTC_USE_STATIC_LIBS
187-
)
187+
)
188188
target_link_libraries(${GNS_TARGET} PUBLIC
189189
steamwebrtc
190-
)
190+
)
191191
endif()
192192
endif()
193193

194194
if(USE_CRYPTO STREQUAL "OpenSSL" OR USE_CRYPTO25519 STREQUAL "OpenSSL")
195195
target_link_libraries(${GNS_TARGET} PUBLIC
196196
OpenSSL::Crypto
197-
)
197+
)
198198
if(WIN32 AND OPENSSL_USE_STATIC_LIBS)
199199
target_link_libraries(${GNS_TARGET} PUBLIC
200200
ws2_32
201201
crypt32
202-
)
202+
)
203203
endif()
204204
endif()
205205

206206
if(USE_CRYPTO STREQUAL "libsodium" OR USE_CRYPTO25519 STREQUAL "libsodium")
207207
target_link_libraries(${GNS_TARGET} PUBLIC
208208
sodium
209-
)
209+
)
210210
endif()
211211

212212
target_compile_definitions(${GNS_TARGET} PRIVATE
@@ -215,7 +215,7 @@ macro(gamenetworkingsockets_common GNS_TARGET)
215215
CRYPTO_DISABLE_ENCRYPT_WITH_PASSWORD
216216
GOOGLE_PROTOBUF_NO_RTTI
217217
${GNS_CRYPTO_DEFINES}
218-
)
218+
)
219219

220220
if(SANITIZE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
221221
target_compile_definitions(${GNS_TARGET} PRIVATE ED25519_NO_INLINE_ASM)
@@ -304,7 +304,7 @@ macro(gamenetworkingsockets_common GNS_TARGET)
304304

305305
set_target_properties(${GNS_TARGET} PROPERTIES
306306
CXX_STANDARD 11
307-
)
307+
)
308308

309309
add_sanitizers(${GNS_TARGET})
310310

@@ -328,27 +328,27 @@ install(
328328
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
329329
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
330330
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
331-
)
331+
)
332332

333333
install(DIRECTORY ../include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GameNetworkingSockets)
334334

335335
install(
336336
EXPORT GameNetworkingSockets
337337
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/GameNetworkingSockets
338338
NAMESPACE GameNetworkingSockets::
339-
)
339+
)
340340

341341
include(CMakePackageConfigHelpers)
342342

343343
configure_package_config_file(../cmake/GameNetworkingSocketsConfig.cmake.in
344344
${CMAKE_CURRENT_BINARY_DIR}/GameNetworkingSocketsConfig.cmake
345345
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/GameNetworkingSockets
346346
PATH_VARS CMAKE_INSTALL_FULL_INCLUDEDIR
347-
)
347+
)
348348

349349
install(FILES
350350
${CMAKE_CURRENT_BINARY_DIR}/GameNetworkingSocketsConfig.cmake
351351
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/GameNetworkingSockets
352-
)
352+
)
353353

354354
# vim: set ts=4 sts=4 sw=4 noet:

0 commit comments

Comments
 (0)