Skip to content

refactor(cmake): Rename CMake dependency variables to align with the latest dependency directory layout. #1353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 1, 2025
Merged

refactor(cmake): Rename CMake dependency variables to align with the latest dependency directory layout. #1353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
086c689
Rename
Bill-hbrhbr Sep 29, 2025
f010717
Merge branch 'main' into rename-deps-core-var
Bill-hbrhbr Sep 29, 2025
d653d0b
Merge branch 'main' into rename-deps-core-var
Bill-hbrhbr Sep 30, 2025
1afb084
Merge branch 'main' into rename-deps-core-var
Bill-hbrhbr Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions components/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,13 @@ if(PROJECT_IS_TOP_LEVEL)
# Include dependency settings if the project isn't being included as a subproject.
# 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-core.cmake"
set(CLP_DEPS_CPP_DIR "${CMAKE_SOURCE_DIR}/../../build/deps/cpp")
include("${CLP_DEPS_CPP_DIR}/cmake-settings/all-core.cmake"
OPTIONAL
RESULT_VARIABLE CLP_DEPS_SETTINGS_FILE_PATH
RESULT_VARIABLE CLP_DEPS_CPP_CORE_SETTINGS_FILE_PATH
)

if(NOT CLP_DEPS_SETTINGS_FILE_PATH STREQUAL "NOTFOUND")
if(NOT CLP_DEPS_CPP_CORE_SETTINGS_FILE_PATH STREQUAL "NOTFOUND")
# Set CMP0144 since our minimum required CMake version is less than 3.27.
if(POLICY "CMP0144")
cmake_policy(SET "CMP0144" "NEW")
Expand Down
6 changes: 3 additions & 3 deletions components/core/cmake/Modules/FindLibLZMA.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ set(liblzma_HEADER "lzma.h")
set(liblzma_LIBNAME "lzma")
set(liblzma_PKGCONFIG_NAME "liblzma")

if(DEFINED CLP_CORE_DEPS_DIR)
if(DEFINED CLP_DEPS_CPP_DIR)
set(ENV{liblzma_ORIG_PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}")
set(ENV{PKG_CONFIG_PATH} "${CLP_CORE_DEPS_DIR}:$ENV{PKG_CONFIG_PATH}")
set(ENV{PKG_CONFIG_PATH} "${CLP_DEPS_CPP_DIR}:$ENV{PKG_CONFIG_PATH}")
endif()

# Run pkg-config
Expand Down Expand Up @@ -90,7 +90,7 @@ if(NOT TARGET LibLZMA::LibLZMA)
endif()

# Restore original value of PKG_CONFIG_PATH
if(DEFINED CLP_CORE_DEPS_DIR)
if(DEFINED CLP_DEPS_CPP_DIR)
set(ENV{PKG_CONFIG_PATH} "$ENV{liblzma_ORIG_PKG_CONFIG_PATH}")
unset(ENV{liblzma_ORIG_PKG_CONFIG_PATH})
endif()
Loading