diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ endif() # Find the python interpreter. This is required for several targets. -find_package(PythonInterp 3.5 REQUIRED) +find_package(Python 3.5 COMPONENTS Interpreter REQUIRED) # Add the magic targets `check-*` add_custom_target(check-all) diff --git a/cmake/modules/BinaryTest.cmake b/cmake/modules/BinaryTest.cmake --- a/cmake/modules/BinaryTest.cmake +++ b/cmake/modules/BinaryTest.cmake @@ -6,7 +6,7 @@ COMMAND ${CMAKE_COMMAND} -E echo "Running symbol-check.py on ${BINARY}..." COMMAND - "${PYTHON_EXECUTABLE}" + "${Python_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/contrib/devtools/symbol-check.py" "$" DEPENDS @@ -24,7 +24,7 @@ COMMAND ${CMAKE_COMMAND} -E echo "Running security-check.py on ${BINARY}..." COMMAND - "${PYTHON_EXECUTABLE}" + "${Python_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/contrib/devtools/security-check.py" "$" DEPENDS diff --git a/contrib/devtools/CMakeLists.txt b/contrib/devtools/CMakeLists.txt --- a/contrib/devtools/CMakeLists.txt +++ b/contrib/devtools/CMakeLists.txt @@ -37,7 +37,7 @@ WORKING_DIRECTORY ${WORKDIR} COMMAND - "${PYTHON_EXECUTABLE}" + "${Python_EXECUTABLE}" "./${TESTNAME}" ) add_dependencies(check-devtools "check-devtools-${TESTNAME}") diff --git a/src/bench/CMakeLists.txt b/src/bench/CMakeLists.txt --- a/src/bench/CMakeLists.txt +++ b/src/bench/CMakeLists.txt @@ -21,7 +21,7 @@ add_custom_command( OUTPUT "${_generated_header_output}" COMMAND - "${PYTHON_EXECUTABLE}" + "${Python_EXECUTABLE}" "data/convert-raw-to-header.py" "${_test_name}" "${_raw_file}" > "${_generated_header_output}" diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt --- a/src/qt/CMakeLists.txt +++ b/src/qt/CMakeLists.txt @@ -457,7 +457,7 @@ "INSTALLNAMETOOL=${CMAKE_INSTALL_NAME_TOOL}" "OTOOL=${CMAKE_OTOOL}" "STRIP=${CMAKE_STRIP}" - "${PYTHON_EXECUTABLE}" + "${Python_EXECUTABLE}" "${MACDEPLOYQTPLUS}" "${STRIPPED_BUNDLE}" -translations-dir "${QT_TRANSLATION_DIR}" @@ -517,7 +517,7 @@ OUTPUT "${DMG_DSSTORE}" COMMAND - "${PYTHON_EXECUTABLE}" + "${Python_EXECUTABLE}" "${GEN_DSSTORE}" "${DMG_DSSTORE}" "${OSX_VOLNAME}" @@ -568,7 +568,7 @@ else() add_custom_target(osx-dmg COMMAND - "${PYTHON_EXECUTABLE}" + "${Python_EXECUTABLE}" "${MACDEPLOYQTPLUS}" "${STRIPPED_BUNDLE}" -translations-dir "${QT_TRANSLATION_DIR}" diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -14,7 +14,7 @@ get_filename_component(TEST_NAME ${f} NAME_WE) add_custom_command(OUTPUT ${h} COMMAND - "${PYTHON_EXECUTABLE}" + "${Python_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/data/generate_header.py" "${TEST_NAME}" "${CMAKE_CURRENT_SOURCE_DIR}/${f}" > ${h} diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -50,7 +50,7 @@ add_custom_target(${TARGET} COMMENT "${COMMENT}" COMMAND - "${PYTHON_EXECUTABLE}" + "${Python_EXECUTABLE}" ./functional/test_runner.py ${ARGN} DEPENDS @@ -94,7 +94,7 @@ add_custom_target(check-bitcoin-util COMMENT "Test Bitcoin utilities..." COMMAND - "${PYTHON_EXECUTABLE}" + "${Python_EXECUTABLE}" ./util/bitcoin-util-test.py DEPENDS ../src/bitcoin-tx @@ -107,7 +107,7 @@ add_custom_target(check-rpcauth COMMENT "Test Bitcoin RPC authentication..." COMMAND - "${PYTHON_EXECUTABLE}" + "${Python_EXECUTABLE}" ./util/rpcauth-test.py DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/util/rpcauth-test.py