Merge branch 'master' into develop

Drewol · Jun 22, 2024 · a92e71a · a92e71a
2 parents f264d38 + 260b050
commit a92e71a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,7 +18,7 @@ option(BUILD_SHARED_LIBS "Build libraries as shared libraries" OFF)
 option(USC_GNU_WERROR "Set Werror for gcc." OFF)
 option(USE_SYSTEM_CPR "Use system CPR" OFF)
 
-project(USC VERSION 0.5.0)
+project(USC VERSION 0.6.0)
 if(WIN32 AND ${CMAKE_VERSION} VERSION_GREATER "3.12")
     cmake_policy(SET CMP0079 NEW)
 endif()

diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -16,6 +16,7 @@ else()
 endif(USE_SYSTEM_CPR)
 
 #discord example program
+set(CLANG_FORMAT_SUFFIX "ignore") #try to disable clang formatter
 option(BUILD_EXAMPLES "Build example apps" OFF)
 add_subdirectory(discord-rpc)
 target_include_directories(discord-rpc PUBLIC discord-rpc/include)
@@ -107,4 +108,4 @@ if(MSVC)
     target_compile_options(nanovg PRIVATE /MP)
     target_compile_options(soundtouch PRIVATE /MP)
     target_compile_options(sqlite3 PRIVATE /MP)
-endif(MSVC)
+endif(MSVC)