Skip to content

Commit cda8244

Browse files
wgtmaczhjwpku
andauthored
fix(cmake): preserve module path when dependency discovery fails (#1097)
Co-authored-by: Junwang Zhao <zhjwpku@gmail.com>
1 parent 89e4c20 commit cda8244

1 file changed

Lines changed: 10 additions & 17 deletions

File tree

‎src/iceberg/iceberg-config.cmake.in‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,16 @@ set(ICEBERG_FIND_EXTRA_ARGS_AWSSDK "@ICEBERG_FIND_EXTRA_ARGS_AWSSDK@")
4747
include(CMakeFindDependencyMacro)
4848

4949
macro(iceberg_find_dependencies dependencies)
50-
if(DEFINED CMAKE_MODULE_PATH)
51-
set(ICEBERG_CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH})
52-
else()
53-
unset(ICEBERG_CMAKE_MODULE_PATH_OLD)
54-
endif()
55-
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
56-
57-
foreach(dependency ${dependencies})
58-
find_dependency(${dependency} ${ICEBERG_FIND_EXTRA_ARGS_${dependency}})
59-
endforeach()
60-
61-
if(DEFINED ICEBERG_CMAKE_MODULE_PATH_OLD)
62-
set(CMAKE_MODULE_PATH ${ICEBERG_CMAKE_MODULE_PATH_OLD})
63-
unset(ICEBERG_CMAKE_MODULE_PATH_OLD)
64-
else()
65-
unset(CMAKE_MODULE_PATH)
66-
endif()
50+
# find_dependency() returns from this file when a dependency is not found.
51+
# Keep changes to CMAKE_MODULE_PATH local even on that early return.
52+
block(SCOPE_FOR VARIABLES
53+
PROPAGATE ${CMAKE_FIND_PACKAGE_NAME}_FOUND
54+
${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE)
55+
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
56+
foreach(dependency ${dependencies})
57+
find_dependency(${dependency} ${ICEBERG_FIND_EXTRA_ARGS_${dependency}})
58+
endforeach()
59+
endblock()
6760
endmacro()
6861

6962
macro(iceberg_find_components components)

0 commit comments

Comments
 (0)