From 1670a430f089ab3b24d643ccc65733a936177bd4 Mon Sep 17 00:00:00 2001
From: Chris Hennes <chennes@pioneerlibrarysystem.org>
Date: Thu, 4 Mar 2021 23:31:04 -0600
Subject: [PATCH] Add output of Pivy version

---
 LibraryVersions.h.cmake                      | 3 +++
 cMake/FindCoin3D.cmake                       | 4 ++++
 cMake/FreeCAD_Helpers/PrintFinalReport.cmake | 1 +
 cMake/FreeCAD_Helpers/SetupPython.cmake      | 1 +
 4 files changed, 9 insertions(+)

diff --git a/LibraryVersions.h.cmake b/LibraryVersions.h.cmake
index 98d4b66b25..b3826872ef 100644
--- a/LibraryVersions.h.cmake
+++ b/LibraryVersions.h.cmake
@@ -45,6 +45,9 @@ constexpr char * FC_VTK_VERSION = "${VTK_VERSION}";
 // Xerces-C
 constexpr char * FC_XERCESC_VERSION = "${XercesC_VERSION}";
 
+// Pivy
+constexpr char * FC_PIVY_VERSION = "${PIVY_VERSION}";
+
 
 #endif // LIBRARY_VERSIONS_H
 
diff --git a/cMake/FindCoin3D.cmake b/cMake/FindCoin3D.cmake
index b135302322..a8d68b7e45 100644
--- a/cMake/FindCoin3D.cmake
+++ b/cMake/FindCoin3D.cmake
@@ -117,5 +117,9 @@ IF(COIN3D_LIBRARIES)
     set(COIN3D_VERSION "${COIN3D_MAJOR_VERSION}.${COIN3D_MINOR_VERSION}.${COIN3D_MICRO_VERSION}")
   ENDIF()
 
+  IF(NOT PIVY_VERSION)
+    execute_process (COMMAND ${Python3_EXECUTABLE} -c "import pivy as p; print(p.__version__,end='')" OUTPUT_VARIABLE PIVY_VERSION)
+  ENDIF()
+
 ENDIF(COIN3D_LIBRARIES)
 
diff --git a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake
index c863011bac..a8faa70159 100644
--- a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake
+++ b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake
@@ -155,6 +155,7 @@ macro(PrintFinalReport)
     message(STATUS "OpenGLU:             [${OPENGL_glu_LIBRARY}][${OPENGL_INCLUDE_DIR}]")
 
     message(STATUS "Coin3D:              ${COIN3D_VERSION} [${COIN3D_LIBRARIES}] [${COIN3D_INCLUDE_DIRS}]")
+    message(STATUS "Pivy:                ${PIVY_VERSION}") 
 
 
     if (WIN32)
diff --git a/cMake/FreeCAD_Helpers/SetupPython.cmake b/cMake/FreeCAD_Helpers/SetupPython.cmake
index 59882b1ef3..d00525d4cc 100644
--- a/cMake/FreeCAD_Helpers/SetupPython.cmake
+++ b/cMake/FreeCAD_Helpers/SetupPython.cmake
@@ -128,6 +128,7 @@ macro(SetupPython)
                                 "Python not found, install Python!\n"
                                 "=================================\n")
         endif()
+        set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
     else()
         find_package(Python3 COMPONENTS Interpreter Development REQUIRED)