From c4c71e5a41f23565c3cf03c5ecc89be6395219ef Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Thu, 10 Oct 2024 23:15:06 -0600 Subject: [PATCH] Sacado: Return snapshotted googletest CMake files to PYTHON_EXECUTABLE (TriBITSPub/TriBITS#610) We should not be touching snapshotted code that we are not even using in Trilinos (at least I don't think we are). Signed-off-by: Roscoe A. Bartlett --- .../googletest/cmake/internal_utils.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/sacado/test/GTestSuite/googletest/googletest/cmake/internal_utils.cmake b/packages/sacado/test/GTestSuite/googletest/googletest/cmake/internal_utils.cmake index f135e5eb1435..b3e8b8190ea0 100644 --- a/packages/sacado/test/GTestSuite/googletest/googletest/cmake/internal_utils.cmake +++ b/packages/sacado/test/GTestSuite/googletest/googletest/cmake/internal_utils.cmake @@ -243,7 +243,7 @@ function(cxx_executable name dir libs) ${name} "${cxx_default}" "${libs}" "${dir}/${name}.cc" ${ARGN}) endfunction() -# Sets PYTHONINTERP_FOUND and Python3_EXECUTABLE. +# Sets PYTHONINTERP_FOUND and PYTHON_EXECUTABLE. find_package(PythonInterp) # cxx_test_with_flags(name cxx_flags libs srcs...) @@ -285,11 +285,11 @@ function(py_test name) if (WIN32 OR MINGW) add_test(NAME ${name} COMMAND powershell -Command ${CMAKE_CURRENT_BINARY_DIR}/$/RunTest.ps1 - ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py + ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py --build_dir=${CMAKE_CURRENT_BINARY_DIR}/$ ${ARGN}) else() add_test(NAME ${name} - COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py --build_dir=${CMAKE_CURRENT_BINARY_DIR}/$ ${ARGN}) endif() else (CMAKE_CONFIGURATION_TYPES) @@ -298,11 +298,11 @@ function(py_test name) if (WIN32 OR MINGW) add_test(NAME ${name} COMMAND powershell -Command ${CMAKE_CURRENT_BINARY_DIR}/RunTest.ps1 - ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py + ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py --build_dir=${CMAKE_CURRENT_BINARY_DIR} ${ARGN}) else() add_test(NAME ${name} - COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py --build_dir=${CMAKE_CURRENT_BINARY_DIR} ${ARGN}) endif() endif (CMAKE_CONFIGURATION_TYPES) @@ -314,11 +314,11 @@ function(py_test name) if (WIN32 OR MINGW) add_test(NAME ${name} COMMAND powershell -Command ${CMAKE_CURRENT_BINARY_DIR}/RunTest.ps1 - ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py + ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py --build_dir=${CMAKE_CURRENT_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE} ${ARGN}) else() add_test(NAME ${name} - COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py --build_dir=${CMAKE_CURRENT_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE} ${ARGN}) endif() endif()