Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
d47abe40
Commit
d47abe40
authored
Aug 15, 2016
by
Brad King
💬
Committed by
Kitware Robot
Aug 15, 2016
Browse files
Merge topic 'GetPrerequisites-fix-regression'
a2d5c25a
GetPrerequisites: Fix regression in gp_resolved_file_type
parents
272a2bf1
a2d5c25a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Modules/GetPrerequisites.cmake
View file @
d47abe40
...
...
@@ -500,7 +500,9 @@ function(gp_resolved_file_type original_file file exepath dirs type_var)
if
(
NOT IS_ABSOLUTE
"
${
original_file
}
"
)
message
(
STATUS
"warning: gp_resolved_file_type expects absolute full path for first arg original_file"
)
endif
()
get_filename_component
(
original_file
"
${
original_file
}
"
ABSOLUTE
)
# canonicalize path
if
(
IS_ABSOLUTE
"
${
original_file
}
"
)
get_filename_component
(
original_file
"
${
original_file
}
"
ABSOLUTE
)
# canonicalize path
endif
()
set
(
is_embedded 0
)
set
(
is_local 0
)
...
...
@@ -516,7 +518,9 @@ function(gp_resolved_file_type original_file file exepath dirs type_var)
if
(
NOT IS_ABSOLUTE
"
${
file
}
"
)
gp_resolve_item
(
"
${
original_file
}
"
"
${
file
}
"
"
${
exepath
}
"
"
${
dirs
}
"
resolved_file
"
${
rpaths
}
"
)
endif
()
get_filename_component
(
resolved_file
"
${
resolved_file
}
"
ABSOLUTE
)
# canonicalize path
if
(
IS_ABSOLUTE
"
${
resolved_file
}
"
)
get_filename_component
(
resolved_file
"
${
resolved_file
}
"
ABSOLUTE
)
# canonicalize path
endif
()
string
(
TOLOWER
"
${
original_file
}
"
original_lower
)
string
(
TOLOWER
"
${
resolved_file
}
"
lower
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment