mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-21 07:28:21 +08:00
init-repository: Fix passing no --alternates option
Commit d6918d7ac5 broke init-repository if
you did not pass an --alternates option.
Pick-to: 6.8 6.10 6.11
Task-number: QTBUG-142712
Fixes: QTBUG-142744
Change-Id: Ia727b420a34a46e52f0f05e549aabe2c975c6d7e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
@@ -427,11 +427,13 @@ endfunction()
|
|||||||
# Convert to absolute path if necessary.
|
# Convert to absolute path if necessary.
|
||||||
function(qt_ir_get_option_as_existing_absolute_path name value)
|
function(qt_ir_get_option_as_existing_absolute_path name value)
|
||||||
qt_ir_get_option_value("${name}" path)
|
qt_ir_get_option_value("${name}" path)
|
||||||
if(NOT EXISTS "${abspath}")
|
if(NOT "${path}" STREQUAL "")
|
||||||
qt_ir_add_error("The path '${path}' passed with -${name} does not exist.")
|
if(NOT EXISTS "${path}")
|
||||||
endif()
|
qt_ir_add_error("The path '${path}' passed with -${name} does not exist.")
|
||||||
if(NOT IS_ABSOLUTE "${path}")
|
endif()
|
||||||
get_filename_component(path "${path}" ABSOLUTE)
|
if(NOT IS_ABSOLUTE "${path}")
|
||||||
|
get_filename_component(path "${path}" ABSOLUTE)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
set("${value}" "${path}" PARENT_SCOPE)
|
set("${value}" "${path}" PARENT_SCOPE)
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|||||||
Reference in New Issue
Block a user