crueter
51b170b470
Transfers the majority of submodules and large externals to CPM, using source archives rather than full Git clones. Not only does this save massive amounts of clone and configure time, but dependencies are grabbed on-demand rather than being required by default. Additionally, CPM will (generally) automatically search for system dependencies, though certain dependencies have options to control this. Testing shows gains ranging from 5x to 10x in terms of overall clone/configure time. Reviewed-on: #143 Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>
40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 760a1b2..540d643 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -12,20 +12,6 @@ file(GLOB_RECURSE ALL_SOURCE_FILES
|
|
src/*.cpp src/*.h src/*.c
|
|
)
|
|
|
|
-# Set CLANG_FORMAT_SUFFIX if you are using custom clang-format, e.g. clang-format-5.0
|
|
-find_program(CLANG_FORMAT_CMD clang-format${CLANG_FORMAT_SUFFIX})
|
|
-
|
|
-if (CLANG_FORMAT_CMD)
|
|
- add_custom_target(
|
|
- clangformat
|
|
- COMMAND ${CLANG_FORMAT_CMD}
|
|
- -i -style=file -fallback-style=none
|
|
- ${ALL_SOURCE_FILES}
|
|
- DEPENDS
|
|
- ${ALL_SOURCE_FILES}
|
|
- )
|
|
-endif(CLANG_FORMAT_CMD)
|
|
-
|
|
# thirdparty stuff
|
|
execute_process(
|
|
COMMAND mkdir ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index 290d761..cd2cc92 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -120,10 +120,6 @@ if (${BUILD_SHARED_LIBS})
|
|
target_compile_definitions(discord-rpc PRIVATE -DDISCORD_BUILDING_SDK)
|
|
endif(${BUILD_SHARED_LIBS})
|
|
|
|
-if (CLANG_FORMAT_CMD)
|
|
- add_dependencies(discord-rpc clangformat)
|
|
-endif(CLANG_FORMAT_CMD)
|
|
-
|
|
# install
|
|
|
|
install(
|