From b46aa342e43911970b12fe682b9033d10efeca5e Mon Sep 17 00:00:00 2001
From: Chris Hennes <chennes@pioneerlibrarysystem.org>
Date: Wed, 19 Feb 2025 10:20:50 -0600
Subject: [PATCH] CMake: Correct use of CACHE

---
 cMake/FindPySide6.cmake                      | 10 +++++-----
 cMake/FindShiboken6.cmake                    | 14 +++++++-------
 cMake/FreeCAD_Helpers/PrintFinalReport.cmake |  2 +-
 cMake/FreeCadMacros.cmake                    |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cMake/FindPySide6.cmake b/cMake/FindPySide6.cmake
index a1f1746755..8f97f0ec4c 100644
--- a/cMake/FindPySide6.cmake
+++ b/cMake/FindPySide6.cmake
@@ -12,15 +12,15 @@ if(NOT PySide6_FOUND)
     if(NOT PySide6_INCLUDE_DIRS)
         find_pip_package(PySide6)
     else()
-        set(PySide6_FOUND ON CACHE BOOL OFF)
+        set(PySide6_FOUND ON)
     endif()
 
 endif()
 
 # Also provide the old-style variables so we don't have to update everything yet
 if (PySide6_FOUND)
-    set(PYSIDE_INCLUDE_DIR ${PySide6_INCLUDE_DIRS} CACHE INTERNAL "")
-    set(PYSIDE_LIBRARY ${PySide6_LIBRARIES} CACHE INTERNAL "")
-    set(PYSIDE_FOUND TRUE CACHE BOOL "(Backwards compatibility PySide6->PySide2) Whether PySide was found")
-    set(PYSIDE_MAJOR_VERSION 6 CACHE INTERNAL 6)
+    set(PYSIDE_INCLUDE_DIR ${PySide6_INCLUDE_DIRS})
+    set(PYSIDE_LIBRARY ${PySide6_LIBRARIES})
+    set(PYSIDE_FOUND TRUE)
+    set(PYSIDE_MAJOR_VERSION 6)
 endif()
diff --git a/cMake/FindShiboken6.cmake b/cMake/FindShiboken6.cmake
index 5288d88ea1..c32b55901e 100644
--- a/cMake/FindShiboken6.cmake
+++ b/cMake/FindShiboken6.cmake
@@ -11,18 +11,18 @@ if(NOT Shiboken6_FOUND)
     if(NOT Shiboken6_INCLUDE_DIR)
         find_pip_package(Shiboken6)
         if (Shiboken6_FOUND)
-            set(SHIBOKEN_LIBRARY ${Shiboken6_LIBRARIES} CACHE INTERNAL "")
-            set(SHIBOKEN_MAJOR_VERSION 6 CACHE INTERNAL 6)
-            set(SHIBOKEN_FOUND ON CACHE BOOL OFF)
+            set(SHIBOKEN_LIBRARY ${Shiboken6_LIBRARIES})
+            set(SHIBOKEN_MAJOR_VERSION 6)
+            set(SHIBOKEN_FOUND ON)
         endif()
         # The include directory we actually want is part of shiboken6-generator
         find_pip_package(shiboken6_generator)
         if (shiboken6_generator_FOUND)
-            set(SHIBOKEN_INCLUDE_DIR ${shiboken6_generator_INCLUDE_DIRS} CACHE PATH "")
+            set(SHIBOKEN_INCLUDE_DIR ${shiboken6_generator_INCLUDE_DIRS})
         endif()
     endif()
 else()
-    set(SHIBOKEN_INCLUDE_DIR ${Shiboken6_INCLUDE_DIRS} CACHE PATH "")
-    set(SHIBOKEN_LIBRARY ${Shiboken6_LIBRARIES} CACHE INTERNAL "")
-    set(SHIBOKEN_FOUND ON CACHE BOOL OFF)
+    set(SHIBOKEN_INCLUDE_DIR ${Shiboken6_INCLUDE_DIRS})
+    set(SHIBOKEN_LIBRARY ${Shiboken6_LIBRARIES})
+    set(SHIBOKEN_FOUND ON)
 endif()
diff --git a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake
index 1ff155437a..1f1cbe86b3 100644
--- a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake
+++ b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake
@@ -14,7 +14,7 @@ macro(PrintFinalReport)
 
     # just a value
     macro(value)
-    unset(val)
+        unset(val)
         set(name ${ARGV0})
         if(${name})
             set(val ${${name}}) # name has a value
diff --git a/cMake/FreeCadMacros.cmake b/cMake/FreeCadMacros.cmake
index c650625ed9..3b92f6d73b 100644
--- a/cMake/FreeCadMacros.cmake
+++ b/cMake/FreeCadMacros.cmake
@@ -309,7 +309,7 @@ macro(find_pip_package PACKAGE)
 			set(${PACKAGE}_LIBRARIES ${DEBUG_LIBRARIES} CACHE PATH "Location of the ${PACKAGE} debug libraries")
 		endif()
 		set(${PACKAGE}_INCLUDE_DIRS ${INCLUDE_DIR} CACHE PATH "Location of the ${PACKAGE} includes")
-		set(${PACKAGE}_FOUND ON CACHE BOOL "${PACKAGE} detection status")
+		set(${PACKAGE}_FOUND ON)
 		message(STATUS "Found pip-installed ${PACKAGE} in ${PIP_PACKAGE_LOCATION}/${PIP_PACKAGE_NAME}")
 		if(${PACKAGE}_INCLUDE_DIRS)
 			message(STATUS "  --> with includes in ${${PACKAGE}_INCLUDE_DIRS}")