More python_setup.cmake improvements

Author: dconeybe

cmake/external/CMakeLists.txt

@@ -15,7 +15,12 @@
 cmake_minimum_required(VERSION 3.5.1)
 project(Firebase-download C CXX)
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+list(
+  APPEND
+  CMAKE_MODULE_PATH
+  ${CMAKE_CURRENT_LIST_DIR}
+  ${CMAKE_CURRENT_LIST_DIR}/..
+)
 
 set(
   FIREBASE_DOWNLOAD_DIR

cmake/external/leveldb.cmake

@@ -14,14 +14,11 @@
 
 include(ExternalProject)
 
-# Find a Python interpreter using the best available mechanism.
-if(${CMAKE_VERSION} VERSION_LESS "3.12")
-  include(FindPythonInterp)
-  set(PATCH_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}")
-else()
-  find_package(Python3 COMPONENTS Interpreter)
-  set(PATCH_PYTHON_EXECUTABLE "${Python3_EXECUTABLE}")
-endif()
+include(python_setup)
+FirebaseSetupPythonInterpreter(
+  OUTVAR MY_PYTHON_EXECUTABLE
+  KEY LevelDbPatch
+)
 
 if(TARGET leveldb)
   return()
@@ -50,7 +47,7 @@ ExternalProject_Add(
   BUILD_COMMAND     ""
   INSTALL_COMMAND   ""
   TEST_COMMAND      ""
-  PATCH_COMMAND     ${PATCH_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/leveldb_patch.py --snappy-source-dir ${snappy_source_dir} --snappy-binary-dir ${snappy_binary_dir}
+  PATCH_COMMAND     "${MY_PYTHON_EXECUTABLE}" ${CMAKE_CURRENT_LIST_DIR}/leveldb_patch.py --snappy-source-dir ${snappy_source_dir} --snappy-binary-dir ${snappy_binary_dir}
 
   HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
 )

cmake/python_setup.cmake

@@ -68,6 +68,8 @@ function(FirebaseSetupPythonInterpreter)
   # Python interpreter path.
   set(CACHEVAR "FIREBASE_PYTHON_EXECUTABLE_${ARG_KEY}")
 
+  set(LOG_PREFIX "${CMAKE_CURRENT_FUNCTION}(${ARG_KEY})")
+
   # Find a Python interpreter using the best available mechanism.
   if(${CMAKE_VERSION} VERSION_LESS "3.12")
     include(FindPythonInterp)
@@ -105,17 +107,15 @@ function(FirebaseSetupPythonInterpreter)
       ("${STAMP_FILE2_CONTENTS}" STREQUAL "${ARG_REQUIREMENTS}")
     )
       set("${ARG_OUTVAR}" "$CACHE{${CACHEVAR}}" PARENT_SCOPE)
-      message(STATUS
-        "${CMAKE_CURRENT_FUNCTION}: Using Python interpreter: $CACHE{${CACHEVAR}}"
-      )
+      message(STATUS "${LOG_PREFIX}: Using Python interpreter: $CACHE{${CACHEVAR}}")
       return()
     endif()
   endif()
 
   # Create the virtualenv.
   message(STATUS
-    "${CMAKE_CURRENT_FUNCTION}: Creating Python virtualenv in "
-    "${PYVENV_DIRECTORY} using ${FIREBASE_PYTHON_HOST_EXECUTABLE}"
+    "${LOG_PREFIX}: Creating Python virtualenv in ${PYVENV_DIRECTORY} "
+    "using ${FIREBASE_PYTHON_HOST_EXECUTABLE}"
   )
   file(REMOVE_RECURSE "${PYVENV_DIRECTORY}")
   execute_process(
@@ -124,7 +124,6 @@ function(FirebaseSetupPythonInterpreter)
       -m
       venv
       "${PYVENV_DIRECTORY}"
-      --upgrade-deps
     RESULT_VARIABLE
       FIREBASE_PYVENV_CREATE_RESULT
   )
@@ -147,16 +146,13 @@ function(FirebaseSetupPythonInterpreter)
     message(FATAL_ERROR "Unable to find Python executable in ${PYVENV_DIRECTORY}")
   else()
     set(PYTHON_EXECUTABLE "$CACHE{${CACHEVAR}}")
-    message(STATUS
-      "${CMAKE_CURRENT_FUNCTION}: Found Python executable in virtualenv: "
-      "${PYTHON_EXECUTABLE}"
-    )
+    message(STATUS "${LOG_PREFIX}: Found Python executable in virtualenv: ${PYTHON_EXECUTABLE}")
   endif()
 
   # Install the dependencies in the virtualenv, if any are requested.
   if(NOT ("${ARG_REQUIREMENTS}" STREQUAL ""))
     message(STATUS
-      "${CMAKE_CURRENT_FUNCTION}: Installing Python dependencies into "
+      "${LOG_PREFIX}: Installing Python dependencies into "
       "${PYVENV_DIRECTORY}: ${ARG_REQUIREMENTS}"
     )
     execute_process(