From ddd484180dae3f313d1af771d7e4eb8d54932af8 Mon Sep 17 00:00:00 2001 From: Alfi Maulana Date: Thu, 15 Dec 2022 11:45:24 +0700 Subject: [PATCH 1/3] update `CPM.cmake` script based on latest guide --- cmake/CPM.cmake | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake index fd6f48a..772103f 100644 --- a/cmake/CPM.cmake +++ b/cmake/CPM.cmake @@ -1,12 +1,21 @@ -set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM.cmake") -set(CPM_VERSION 0.36.0) +set(CPM_DOWNLOAD_VERSION 0.36.0) -if(NOT EXISTS ${CPM_DOWNLOAD_LOCATION}) - message(STATUS "Downloading CPM.cmake") - file( - DOWNLOAD - https://github.com/TheLartians/CPM.cmake/releases/download/v${CPM_VERSION}/CPM.cmake - ${CPM_DOWNLOAD_LOCATION}) +if(CPM_SOURCE_CACHE) + set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake") +elseif(DEFINED ENV{CPM_SOURCE_CACHE}) + set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake") +else() + set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake") +endif() + +# Expand relative path. This is important if the provided path contains a tilde (~) +get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE) +if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION})) + message(STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}") + file(DOWNLOAD + https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake + ${CPM_DOWNLOAD_LOCATION} + ) endif() include(${CPM_DOWNLOAD_LOCATION}) From 67bc6d3faaeb47692b09e7f07e599e94de7ac9bc Mon Sep 17 00:00:00 2001 From: Alfi Maulana Date: Thu, 15 Dec 2022 11:46:15 +0700 Subject: [PATCH 2/3] add cmake format configuration --- .cmake-format | 2 ++ cmake/CPM.cmake | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 .cmake-format diff --git a/.cmake-format b/.cmake-format new file mode 100644 index 0000000..a82efe8 --- /dev/null +++ b/.cmake-format @@ -0,0 +1,2 @@ +with section("format"): + line_width = 120 diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake index 772103f..8aabbed 100644 --- a/cmake/CPM.cmake +++ b/cmake/CPM.cmake @@ -12,10 +12,8 @@ endif() get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE) if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION})) message(STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}") - file(DOWNLOAD - https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake - ${CPM_DOWNLOAD_LOCATION} - ) + file(DOWNLOAD https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake + ${CPM_DOWNLOAD_LOCATION}) endif() include(${CPM_DOWNLOAD_LOCATION}) From a646a8ef85dfe9ff20b6fbd424b0c638cc9f2fd8 Mon Sep 17 00:00:00 2001 From: Alfi Maulana Date: Thu, 15 Dec 2022 12:01:17 +0700 Subject: [PATCH 3/3] convert `.cmake-format` config to JSON --- .cmake-format | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.cmake-format b/.cmake-format index a82efe8..ae7c741 100644 --- a/.cmake-format +++ b/.cmake-format @@ -1,2 +1,3 @@ -with section("format"): - line_width = 120 +{ + "line_width": 120 +}