Skip to content

build: bootstrap now works under Windows #956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 5, 2025
Merged

build: bootstrap now works under Windows #956

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,8 @@ def cmake_workflow(self, src_dir, build_type, build_dir, install_dir, extra_args
config_args.extend(["-DCMAKE_C_COMPILER=" + self.options.cc,
"-DCMAKE_CXX_COMPILER=" + self.options.cxx])

if self.is_windows():
config_args.extend(["-DPYTHON_EXECUTABLE=" + sys.executable])
# "OptimizedDebug" is not a valid build type. We interpret it as a special case
# where the build type is Debug and optimizations are enabled.
# This is equivalent to RelWithDebInfo on Unix, but ensures
Expand Down Expand Up @@ -1151,6 +1153,7 @@ def create_cmake_presets(self):
if cxx_flags:
new_preset["cacheVariables"]['CMAKE_CXX_FLAGS'] = cxx_flags.strip()

new_preset["cacheVariables"]["PYTHON_EXECUTABLE"] = sys.executable

# Update cache variables path prefixes with their relative equivalents
mrdocs_src_dir_parent = os.path.dirname(self.options.mrdocs_src_dir)
Expand Down Expand Up @@ -1398,8 +1401,9 @@ def generate_clion_run_configs(self, configs):
if 'folder' in config:
attrib["folderName"] = config["folder"]
clion_config = ET.SubElement(root, "configuration", attrib)
args = config.get("args") or []
ET.SubElement(clion_config, "option", name="SCRIPT_TEXT",
value=f"{shlex.quote(config['script'])} {' '.join(shlex.quote(arg) for arg in config['args'])}")
value=f"{shlex.quote(config['script'])} {' '.join(shlex.quote(arg) for arg in args)}")
ET.SubElement(clion_config, "option", name="INDEPENDENT_SCRIPT_PATH", value="true")
ET.SubElement(clion_config, "option", name="SCRIPT_PATH", value=config["script"])
ET.SubElement(clion_config, "option", name="SCRIPT_OPTIONS", value="")
Expand Down
Loading