File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -252,7 +252,7 @@ macro(resolve_dependency DEPENDENCY_NAME)
252252 set (PACKAGE_NAME ${DEPENDENCY_NAME} )
253253 endif ()
254254 set (FIND_PACKAGE_ARGUMENTS ${PACKAGE_NAME} )
255- if (ARG_REQUIRED_VERSION AND NOT FORCE_ANY_NEWER_VERSION )
255+ if (ARG_REQUIRED_VERSION AND NOT ARG_FORCE_ANY_NEWER_VERSION )
256256 list (APPEND FIND_PACKAGE_ARGUMENTS ${ARG_REQUIRED_VERSION} )
257257 endif ()
258258 if (ARG_USE_CONFIG)
@@ -265,7 +265,7 @@ macro(resolve_dependency DEPENDENCY_NAME)
265265 find_package (${FIND_PACKAGE_ARGUMENTS} )
266266 set (COMPATIBLE ${${PACKAGE_NAME} _FOUND})
267267 if (COMPATIBLE
268- AND FORCE_ANY_NEWER_VERSION
268+ AND ARG_FORCE_ANY_NEWER_VERSION
269269 AND ARG_REQUIRED_VERSION)
270270 if (${${PACKAGE_NAME} _VERSION} VERSION_LESS ${ARG_REQUIRED_VERSION} )
271271 message (DEBUG "Couldn't find ${DEPENDENCY_NAME} >= ${ARG_REQUIRED_VERSION} " )
@@ -282,7 +282,7 @@ macro(resolve_dependency DEPENDENCY_NAME)
282282 build_dependency (${DEPENDENCY_NAME} )
283283 elseif (${DEPENDENCY_NAME} _SOURCE STREQUAL "SYSTEM" )
284284 find_package (${FIND_PACKAGE_ARGUMENTS} REQUIRED )
285- if (FORCE_ANY_NEWER_VERSION AND ARG_REQUIRED_VERSION)
285+ if (ARG_FORCE_ANY_NEWER_VERSION AND ARG_REQUIRED_VERSION)
286286 if (${${PACKAGE_NAME} _VERSION} VERSION_LESS ${ARG_REQUIRED_VERSION} )
287287 message (FATAL_ERROR "Couldn't find ${DEPENDENCY_NAME} >= ${ARG_REQUIRED_VERSION} " )
288288 endif ()
You can’t perform that action at this time.
0 commit comments