From 74b0c6efaebd633a5d1ff0409fad1cbd0dddd24a Mon Sep 17 00:00:00 2001
From: Chris Hennes <chennes@pioneerlibrarysystem.org>
Date: Thu, 11 Feb 2021 11:44:10 -0600
Subject: [PATCH] [CMAKE] Cleanup version info for Python & XercesC

---
 cMake/FindPyCXX.cmake                        |  1 +
 cMake/FindXercesC.cmake                      | 51 --------------------
 cMake/FreeCAD_Helpers/PrintFinalReport.cmake |  6 +--
 3 files changed, 4 insertions(+), 54 deletions(-)
 delete mode 100644 cMake/FindXercesC.cmake

diff --git a/cMake/FindPyCXX.cmake b/cMake/FindPyCXX.cmake
index ca3a1c4521..8de77eebf7 100644
--- a/cMake/FindPyCXX.cmake
+++ b/cMake/FindPyCXX.cmake
@@ -5,6 +5,7 @@
 # PYCXX_SOURCE_DIR
 # PYCXX_FOUND
 # PYCXX_SOURCES
+# PYCXX_VERSION
 #
 # The PYCXX_*_DIR variables can be set to tell this module where
 # the files are.
diff --git a/cMake/FindXercesC.cmake b/cMake/FindXercesC.cmake
deleted file mode 100644
index a4181c41d7..0000000000
--- a/cMake/FindXercesC.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-# Locate Xerces-C include paths and libraries
-# Xerces-C can be found at http://xml.apache.org/xerces-c/
-# Written by Frederic Heem, frederic.heem _at_ telsey.it
-# Modified by Jos van den Oever
-
-# This module defines
-# XercesC_INCLUDE_DIRS, where to find ptlib.h, etc.
-# XercesC_LIBRARIES, the libraries to link against to use pwlib.
-# XercesC_FOUND, If false, don't try to use pwlib.
-
-FIND_PATH(XercesC_INCLUDE_DIRS xercesc/dom/DOM.hpp
-  ${CMAKE_INCLUDE_PATH}
-  "[HKEY_CURRENT_USER\\software\\xerces-c\\src]"
-  "[HKEY_CURRENT_USER\\xerces-c\\src]"
-  $ENV{XERCESCROOT}/src/
-  /usr/local/include
-  /usr/include
-)
-
-FIND_LIBRARY(XercesC_LIBRARIES
-  NAMES
-    xerces-c
-    xerces-c_3
-  PATHS
-    ${CMAKE_LIBRARY_PATH}
-    "[HKEY_CURRENT_USER\\software\\xerces-c\\lib]"
-    "[HKEY_CURRENT_USER\\xerces-c\\lib]"
-    $ENV{XERCESCROOT}/${LIB_DESTINATION}
-    /usr/local/${LIB_DESTINATION}
-    /usr/${LIB_DESTINATION}
-)
-
-# if the include a the library are found then we have it
-IF(XercesC_INCLUDE_DIRS AND XercesC_LIBRARIES)
-  SET(XercesC_FOUND "YES" )
-  IF(NOT XERCESC__FIND_QUIETLY)
-    MESSAGE(STATUS "Found Xerces-C: ${XercesC_LIBRARIES}")
-  ENDIF(NOT XERCESC__FIND_QUIETLY)
-ELSE(XercesC_INCLUDE_DIRS AND XercesC_LIBRARIES)
-  IF(XERCESC_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Xerces-C was not found.")
-  ENDIF(XERCESC_FIND_REQUIRED)
-  IF(NOT XERCESC__FIND_QUIETLY)
-    MESSAGE(STATUS "Xerces-C was not found.")
-  ENDIF(NOT XERCESC__FIND_QUIETLY)
-ENDIF(XercesC_INCLUDE_DIRS AND XercesC_LIBRARIES)
-
-#MARK_AS_ADVANCED(
-#  XercesC_INCLUDE_DIRS
-#  XercesC_LIBRARIES
-#)
diff --git a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake
index 42de8595a4..2d29e45ed9 100644
--- a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake
+++ b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake
@@ -13,7 +13,7 @@ macro(PrintFinalReport)
     message(STATUS "Standard:            Requires C++${CMAKE_CXX_STANDARD}")
 
     # Qt5 needs/sets PYTHON_CONFIG_SUFFIX regarding Shiboken
-    message(STATUS "Python:              [${PYTHON_EXECUTABLE}] [${PYTHON_CONFIG_SUFFIX}]")
+    message(STATUS "Python:              ${PYTHON_VERSION_STRING} [${PYTHON_EXECUTABLE}] [${PYTHON_CONFIG_SUFFIX}]")
 
     if(DEFINED PCL_FOUND)
         message(STATUS "PCL:                 ${PCL_VERSION}")
@@ -29,7 +29,7 @@ macro(PrintFinalReport)
 
     message(STATUS "Boost:               ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION} (${Boost_VERSION})")
 
-    message(STATUS "XercesC:             [${XercesC_LIBRARIES}] [${XercesC_INCLUDE_DIRS}]")
+    message(STATUS "XercesC:             ${XercesC_VERSION} [${XercesC_LIBRARIES}] [${XercesC_INCLUDE_DIRS}]")
 
     message(STATUS "ZLIB:                ${ZLIB_VERSION_STRING}")
 
@@ -164,7 +164,7 @@ macro(PrintFinalReport)
     endif(FREECAD_USE_FREETYPE)
 
     message(STATUS "OpenGL:              ${OPENGL_gl_LIBRARY}")
-    message(STATUS "OpenGLU:             ${OPENGL_glu_LIBRARY} [${OPENGL_glu_LIBRARY}][${OPENGL_INCLUDE_DIR}]")
+    message(STATUS "OpenGLU:             [${OPENGL_glu_LIBRARY}][${OPENGL_INCLUDE_DIR}]")
 
     message(STATUS "Coin3D:              ${COIN3D_VERSION} [${COIN3D_LIBRARIES}] [${COIN3D_INCLUDE_DIRS}]")