Skip to content

ORC-2235: [C++] Preserve CMAKE_MODULE_PATH when dependency discovery fails #2735

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

Closed
wgtmac wants to merge 2 commits into from
Closed

ORC-2235: [C++] Preserve CMAKE_MODULE_PATH when dependency discovery fails #2735

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a3c5e0
ORC-2235: [C++] Preserve CMAKE_MODULE_PATH when dependency discovery …
wgtmac Nov 6, 2026
e02428f
ORC-2235: Remove CMake test infrastructure changes
wgtmac Nov 6, 2026
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
25 changes: 8 additions & 17 deletions c++/orcConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,15 @@

set(ORC_SYSTEM_DEPENDENCIES "@ORC_SYSTEM_DEPENDENCIES@")

if(DEFINED CMAKE_MODULE_PATH)
set(ORC_CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH})
else()
unset(ORC_CMAKE_MODULE_PATH_OLD)
endif()
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")

include(CMakeFindDependencyMacro)
foreach(dependency ${ORC_SYSTEM_DEPENDENCIES})
find_dependency(${dependency})
endforeach()

if(DEFINED ORC_CMAKE_MODULE_PATH_OLD)
set(CMAKE_MODULE_PATH ${ORC_CMAKE_MODULE_PATH_OLD})
unset(ORC_CMAKE_MODULE_PATH_OLD)
else()
unset(CMAKE_MODULE_PATH)
endif()
# find_dependency() returns from this file when a dependency is not found.
# Keep changes to CMAKE_MODULE_PATH local even on that early return.
block(SCOPE_FOR VARIABLES PROPAGATE orc_FOUND orc_NOT_FOUND_MESSAGE)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
foreach(dependency ${ORC_SYSTEM_DEPENDENCIES})
find_dependency(${dependency})
endforeach()
endblock()

include("${CMAKE_CURRENT_LIST_DIR}/orcTargets.cmake")

Expand Down
Loading