diff options
author | Ken Liu <Ken.Liu@arm.com> | 2020-10-12 10:58:21 +0800 |
---|---|---|
committer | Anton Komlev <Anton.Komlev@arm.com> | 2020-10-13 10:19:11 +0000 |
commit | a2ac1f92bae51941e527f5b57c9474819e2c9ca0 (patch) | |
tree | 6bbab003f2d5d03269362bfd87504db5037a7e5b /tools | |
parent | 3ede971de5d707bf1dbe0c551fed69861b8ad0fc (diff) | |
download | trusted-firmware-m-a2ac1f92bae51941e527f5b57c9474819e2c9ca0.tar.gz |
Build: Update windows build settings
The regex for converting relative path into the absolute path doesn't
care windows absolute format, which would fail the windows build if
users assign an out-of-tree 'TFM_TEST_REPO_PATH'. Check the windows
absolute path by checking the second character is ':' or not.
Change-Id: I48539a3ae0fe11ac7b638ca39ca82249ed9c7016
Signed-off-by: Ken Liu <Ken.Liu@arm.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 0d027e8f61..89cf02704a 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -47,15 +47,15 @@ endfunction() parse_field_from_yaml("${GENERATED_FILE_LISTS}" template TEMPLATE_FILES) # Replace relative paths with absolute paths -list(TRANSFORM TEMPLATE_FILES REPLACE "^([^/\\].*)" "${CMAKE_SOURCE_DIR}/\\1") +list(TRANSFORM TEMPLATE_FILES REPLACE "^([^/\\][^:].*)" "${CMAKE_SOURCE_DIR}/\\1") parse_field_from_yaml("${GENERATED_FILE_LISTS}" output OUTPUT_FILES) # Replace relative paths with absolute paths -list(TRANSFORM OUTPUT_FILES REPLACE "^([^/\\].*)" "${CMAKE_BINARY_DIR}/generated/\\1") +list(TRANSFORM OUTPUT_FILES REPLACE "^([^/\\][^:].*)" "${CMAKE_BINARY_DIR}/generated/\\1") parse_field_from_yaml("${MANIFEST_LISTS}" manifest MANIFEST_FILES) # Replace relative paths with absolute paths -list(TRANSFORM MANIFEST_FILES REPLACE "^([^/\\].*)" "${CMAKE_SOURCE_DIR}/\\1") +list(TRANSFORM MANIFEST_FILES REPLACE "^([^/\\][^:].*)" "${CMAKE_SOURCE_DIR}/\\1") ############################### Command declaration ############################ |