From 435d839647fee4b0ec3f0f41795cc9f5f4f5bbc7 Mon Sep 17 00:00:00 2001 From: sitaowang1998 Date: Thu, 25 Sep 2025 10:23:57 -0400 Subject: [PATCH 1/2] Split cmake setting files --- components/core/CMakeLists.txt | 2 +- taskfiles/deps/main.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/components/core/CMakeLists.txt b/components/core/CMakeLists.txt index 872c31b5b5..0c8b8dd3b0 100644 --- a/components/core/CMakeLists.txt +++ b/components/core/CMakeLists.txt @@ -123,7 +123,7 @@ if(PROJECT_IS_TOP_LEVEL) # NOTE: We mark the file optional since it's not required if the user happens to have the # dependencies installed already. set(CLP_CORE_DEPS_DIR "${CMAKE_SOURCE_DIR}/../../build/deps/cpp") - include("${CLP_CORE_DEPS_DIR}/cmake-settings/all.cmake" + include("${CLP_CORE_DEPS_DIR}/cmake-settings/core-all.cmake" OPTIONAL RESULT_VARIABLE CLP_DEPS_SETTINGS_FILE_PATH ) diff --git a/taskfiles/deps/main.yaml b/taskfiles/deps/main.yaml index b3cef6fa20..2a32183b9c 100644 --- a/taskfiles/deps/main.yaml +++ b/taskfiles/deps/main.yaml @@ -46,6 +46,7 @@ tasks: - task: "yscope-dev-utils:cmake:install-deps-and-generate-settings" vars: CMAKE_SETTINGS_DIR: "{{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}" + CMAKE_SETTINGS_FILE: "{{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}/core-all.cmake" DEP_TASK: "core-all-parallel" - task: "utils:combine-cpp-checksum-files" @@ -105,7 +106,7 @@ tasks: WORK_DIR: "{{.G_SPIDER_BUILD_DIR}}" CMAKE_JOBS: "{{.G_CPP_MAX_PARALLELISM_PER_BUILD_TASK}}" CMAKE_GEN_ARGS: - - "-C {{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}/all.cmake" + - "-C {{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}/spider-all.cmake" - "-DCMAKE_BUILD_TYPE=Release" - "-DCMAKE_INSTALL_MESSAGE=LAZY" - "-DSPIDER_BUILD_TESTING=OFF" @@ -121,6 +122,7 @@ tasks: - task: "yscope-dev-utils:cmake:install-deps-and-generate-settings" vars: CMAKE_SETTINGS_DIR: "{{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}" + CMAKE_SETTINGS_FILE: "{{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}/spider-all.cmake" DEP_TASK: "spider-all-parallel" - task: "utils:combine-cpp-checksum-files" From cc581ed13729def1336255befa1d9b9d7e45cc96 Mon Sep 17 00:00:00 2001 From: sitaowang1998 Date: Thu, 25 Sep 2025 15:30:48 -0400 Subject: [PATCH 2/2] Rename cmake setting files --- components/core/CMakeLists.txt | 2 +- taskfiles/deps/main.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/core/CMakeLists.txt b/components/core/CMakeLists.txt index 0c8b8dd3b0..78f4ec1dd7 100644 --- a/components/core/CMakeLists.txt +++ b/components/core/CMakeLists.txt @@ -123,7 +123,7 @@ if(PROJECT_IS_TOP_LEVEL) # NOTE: We mark the file optional since it's not required if the user happens to have the # dependencies installed already. set(CLP_CORE_DEPS_DIR "${CMAKE_SOURCE_DIR}/../../build/deps/cpp") - include("${CLP_CORE_DEPS_DIR}/cmake-settings/core-all.cmake" + include("${CLP_CORE_DEPS_DIR}/cmake-settings/all-core.cmake" OPTIONAL RESULT_VARIABLE CLP_DEPS_SETTINGS_FILE_PATH ) diff --git a/taskfiles/deps/main.yaml b/taskfiles/deps/main.yaml index 2a32183b9c..85eb65a31c 100644 --- a/taskfiles/deps/main.yaml +++ b/taskfiles/deps/main.yaml @@ -46,7 +46,7 @@ tasks: - task: "yscope-dev-utils:cmake:install-deps-and-generate-settings" vars: CMAKE_SETTINGS_DIR: "{{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}" - CMAKE_SETTINGS_FILE: "{{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}/core-all.cmake" + CMAKE_SETTINGS_FILE: "{{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}/all-core.cmake" DEP_TASK: "core-all-parallel" - task: "utils:combine-cpp-checksum-files" @@ -106,7 +106,7 @@ tasks: WORK_DIR: "{{.G_SPIDER_BUILD_DIR}}" CMAKE_JOBS: "{{.G_CPP_MAX_PARALLELISM_PER_BUILD_TASK}}" CMAKE_GEN_ARGS: - - "-C {{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}/spider-all.cmake" + - "-C {{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}/all-spider.cmake" - "-DCMAKE_BUILD_TYPE=Release" - "-DCMAKE_INSTALL_MESSAGE=LAZY" - "-DSPIDER_BUILD_TESTING=OFF" @@ -122,7 +122,7 @@ tasks: - task: "yscope-dev-utils:cmake:install-deps-and-generate-settings" vars: CMAKE_SETTINGS_DIR: "{{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}" - CMAKE_SETTINGS_FILE: "{{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}/spider-all.cmake" + CMAKE_SETTINGS_FILE: "{{.G_DEPS_CPP_CMAKE_SETTINGS_DIR}}/all-spider.cmake" DEP_TASK: "spider-all-parallel" - task: "utils:combine-cpp-checksum-files"