github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2025-04-03 16:10:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not depend on unversioned python binary (#1496)

Browse Source 
Some linux distributions no longer provide `python` binary and require
usage of `python3` instead. This changes the scripts here and uses
cmake `find_package(Python3` when running python.

Co-authored-by: Dominic Hamon <dominichamon@users.noreply.github.com>
This commit is contained in:
Matthias Braun 2022-10-10 04:46:41 -07:00 committed by GitHub
parent 12e0d70a43
commit 229bc5a937
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -332,6 +332,7 @@ include_directories(${PROJECT_SOURCE_DIR}/include)
add_subdirectory(src) add_subdirectory(src)
if (BENCHMARK_ENABLE_TESTING) if (BENCHMARK_ENABLE_TESTING)
find_package(Python3 3.6 REQUIRED COMPONENTS Interpreter)
enable_testing() enable_testing()
if (BENCHMARK_ENABLE_GTEST_TESTS AND if (BENCHMARK_ENABLE_GTEST_TESTS AND
NOT (TARGET gtest AND TARGET gtest_main AND NOT (TARGET gtest AND TARGET gtest_main AND

2
test/AssemblyTests.cmake
View File

@ -47,7 +47,7 @@ macro(add_filecheck_test name)
set_target_properties(${name} PROPERTIES COMPILE_FLAGS "-S ${ASM_TEST_FLAGS}") set_target_properties(${name} PROPERTIES COMPILE_FLAGS "-S ${ASM_TEST_FLAGS}")
set(ASM_OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/${name}.s") set(ASM_OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/${name}.s")
add_custom_target(copy_${name} ALL add_custom_target(copy_${name} ALL
COMMAND ${PROJECT_SOURCE_DIR}/tools/strip_asm.py COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/strip_asm.py
$<TARGET_OBJECTS:${name}> $<TARGET_OBJECTS:${name}>
${ASM_OUTPUT_FILE} ${ASM_OUTPUT_FILE}
BYPRODUCTS ${ASM_OUTPUT_FILE}) BYPRODUCTS ${ASM_OUTPUT_FILE})

2
tools/compare.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
import unittest import unittest
""" """

2
tools/strip_asm.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
""" """
strip_asm.py - Cleanup ASM output for the specified file strip_asm.py - Cleanup ASM output for the specified file