Skip to content

Fix some cmake logic related to python #1557

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 3 commits into from
Apr 28, 2025
Merged

Fix some cmake logic related to python #1557

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
ade8f2f
Remove unneeded check for python3 from sdf folder
scpeters Apr 9, 2025
f4df9bf
Fix check for psutil python package
scpeters Apr 9, 2025
3a3e8a4
Merge branch 'sdf15' into scpeters/fix_python_cmake_checks
scpeters Apr 10, 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
7 changes: 1 addition & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,7 @@ if (BUILD_SDF)

################################################
# Find psutil python package for memory tests
if (BUILD_TESTING)
find_python_module(psutil)
if (NOT PY_PSUTIL)
gz_build_warning("Python psutil package not found. Memory leak tests will be skipped")
endif()
endif()
find_python_module(psutil)

########################################
# Find gz math
Expand Down
4 changes: 0 additions & 4 deletions sdf/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ add_subdirectory(1.12)
add_custom_target(schema)
add_dependencies(schema schema1_11)

if (NOT Python3_Interpreter_FOUND)
gz_build_error("Python is required to generate the C++ file with the SDF content")
endif()

# Generate the EmbeddedSdf.cc file, which contains all the supported SDF
# descriptions in a map of strings. The parser.cc file uses EmbeddedSdf.hh.
set(EMBEDDED_SDF_CC_PATH "${PROJECT_BINARY_DIR}/src/EmbeddedSdf.cc")
Expand Down
4 changes: 3 additions & 1 deletion test/integration/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,10 @@ set(tests
world_dom.cc
)

if (Python3_Interpreter_FOUND AND PY_PSUTIL)
if (PY_PSUTIL)
set(tests ${tests} element_memory_leak.cc)
else()
message(WARNING "Python psutil package not found. Memory leak tests will be skipped")
endif()

find_program(XMLLINT_EXE xmllint)
Expand Down
Loading