aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMike Schuchardt <mikes@lunarg.com>2018-11-08 16:44:13 -0800
committerMike Schuchardt <mikes@lunarg.com>2018-11-09 14:38:46 -0800
commitf08e327b161dbb96223bf1687c7304096e63c064 (patch)
tree5c63fedf1653a3fa0d3cbe156778afdb4828af54 /scripts
parent7d074d4fb44bb362e7b356c85a6cb92286056a3e (diff)
downloadvulkan-tools-f08e327b161dbb96223bf1687c7304096e63c064.tar.gz
scripts: Fix windows paths in helper.cmake
Normalize (all slashes going the same direction) and escape ("\" to "\\") paths when writing helper.cmake. CMake was previously interpreting the single '\' characters and whatever followed as invalid escape sequences. Linux and macOS are unaffected.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/update_deps.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/update_deps.py b/scripts/update_deps.py
index 119cf702..5d00eb5b 100755
--- a/scripts/update_deps.py
+++ b/scripts/update_deps.py
@@ -306,9 +306,9 @@ class GoodRepo(object):
self.build_dir = None
self.install_dir = None
if json.get('build_dir'):
- self.build_dir = json['build_dir']
+ self.build_dir = os.path.normpath(json['build_dir'])
if json.get('install_dir'):
- self.install_dir = json['install_dir']
+ self.install_dir = os.path.normpath(json['install_dir'])
self.deps = json['deps'] if ('deps' in json) else []
self.prebuild = json['prebuild'] if ('prebuild' in json) else []
self.prebuild_linux = json['prebuild_linux'] if (
@@ -520,6 +520,8 @@ def CreateHelper(args, repos, filename):
This information is baked into the CMake files of the home repo and so
this dictionary is kept with the repo via the json file.
"""
+ def escape(path):
+ return path.replace('\\', '\\\\')
install_names = GetInstallNames(args)
with open(filename, 'w') as helper_file:
for repo in repos:
@@ -527,7 +529,7 @@ def CreateHelper(args, repos, filename):
helper_file.write('set({var} "{dir}" CACHE STRING "" FORCE)\n'
.format(
var=install_names[repo.name],
- dir=repo.install_dir))
+ dir=escape(repo.install_dir)))
def main():