dolysis
/
benchmark
mirror of https://github.com/google/benchmark.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Partially revert "Do not depend on unversioned python binary (#1496)" (#1501) 

As predicted, the cmake part of the change is contentious.
https://github.com/google/benchmark/pull/1496#issuecomment-1276508266

This partially reverts commit 229bc5a937.
This commit is contained in:
Roman Lebedev 2022-10-13 12:03:29 +03:00 committed by GitHub
parent 229bc5a937
commit db4f581fbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -332,7 +332,6 @@ 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 ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/tools/strip_asm.py COMMAND ${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})