mirrors/discord-rpc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Disable code formatting on CI builds.

Browse source
This commit is contained in:
Chris Marsh 2017-11-29 09:50:22 -08:00
parent 2af5adca3d
commit 8af28e46be
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -25,11 +25,6 @@ if (CLANG_FORMAT_CMD)
DEPENDS DEPENDS
${ALL_SOURCE_FILES} ${ALL_SOURCE_FILES}
) )
else(CLANG_FORMAT_CMD)
add_custom_target(
clangformat
COMMENT "no clang format"
)
endif(CLANG_FORMAT_CMD) endif(CLANG_FORMAT_CMD)
# thirdparty stuff # thirdparty stuff

3
build.py
View file

@ -79,6 +79,9 @@ def build_lib(build_name, generator, options):
] ]
if generator: if generator:
initial_cmake.extend(['-G', generator]) initial_cmake.extend(['-G', generator])
if IS_BUILD_MACHINE:
# disable formatting on CI builds
initial_cmake.append('-DCLANG_FORMAT_SUFFIX=none')
for key in options: for key in options:
val = 'ON' if options[key] else 'OFF' val = 'ON' if options[key] else 'OFF'
initial_cmake.append('-D%s=%s' % (key, val)) initial_cmake.append('-D%s=%s' % (key, val))

4
src/CMakeLists.txt
View file

@ -106,7 +106,9 @@ if (${BUILD_SHARED_LIBS})
target_compile_definitions(discord-rpc PRIVATE -DDISCORD_BUILDING_SDK) target_compile_definitions(discord-rpc PRIVATE -DDISCORD_BUILDING_SDK)
endif(${BUILD_SHARED_LIBS}) endif(${BUILD_SHARED_LIBS})
add_dependencies(discord-rpc clangformat) if (CLANG_FORMAT_CMD)
add_dependencies(discord-rpc clangformat)
endif(CLANG_FORMAT_CMD)
# install # install