Skip to content

build: cmake QOL improvements #3941

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

Open
davvid wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

build: cmake QOL improvements #3941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad11ef2
cmake: only replace shebangs on the first line
davvid Oct 8, 2025
18f460e
cmake: avoid invalid escape sequences in parsetimingOutput.py
davvid Oct 8, 2025
3dba26a
cmake: generate compile_commands.json for use by developer tools
davvid Oct 8, 2025
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
3 changes: 3 additions & 0 deletions cmake/defaults/ProjectDefaults.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Turn on folder usage
set_property(GLOBAL PROPERTY USE_FOLDERS ON)

# Generate compile_commands.json for use by developer tools.
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

# Default build type
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release")
Expand Down
7 changes: 5 additions & 2 deletions cmake/macros/shebang.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,8 @@
else:
with open(sys.argv[2], 'r') as s:
with open(sys.argv[3], 'w') as d:
for line in s:
d.write(line.replace('/pxrpythonsubst', sys.argv[1]))
for idx, line in enumerate(s):
if idx == 0:
d.write(line.replace('/pxrpythonsubst', sys.argv[1]))
else:
d.write(line)
20 changes: 10 additions & 10 deletions extras/performance/parseTimingOutput.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
"""
import re

make_re = lambda s: re.compile('(Time\ to\ )' + s + '(.*s)')
make_re = lambda s: re.compile(r'(Time\ to\ )' + s + '(.*s)')

# `usdview --timing` metrics
METRICS = [
("configure_and_load_plugins", make_re('(configure\ and\ load\ plugins:)')),
("open_stage", make_re('(open\ stage.*:)')),
("reset_prim_browser", make_re('(reset\ Prim\ Browser\ to.*:)')),
("bring_up_the_ui", make_re('(bring\ up\ the\ UI:)')),
("create_first_image", make_re('(create\ first\ image:)')),
("shut_down_hydra", make_re('(shut\ down\ Hydra:)')),
("close_stage", make_re('(close\ stage.*:)')),
("tear_down_the_ui", make_re('(tear\ down\ the\ UI:)')),
("open_and_close_usdview", make_re('(open\ and\ close\ usdview:)')),
("configure_and_load_plugins", make_re(r'(configure\ and\ load\ plugins:)')),
("open_stage", make_re(r'(open\ stage.*:)')),
("reset_prim_browser", make_re(r'(reset\ Prim\ Browser\ to.*:)')),
("bring_up_the_ui", make_re(r'(bring\ up\ the\ UI:)')),
("create_first_image", make_re(r'(create\ first\ image:)')),
("shut_down_hydra", make_re(r'(shut\ down\ Hydra:)')),
("close_stage", make_re(r'(close\ stage.*:)')),
("tear_down_the_ui", make_re(r'(tear\ down\ the\ UI:)')),
("open_and_close_usdview", make_re(r'(open\ and\ close\ usdview:)')),
]


Expand Down