diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst
index dc11956f6e..ef92ec6bac 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -470,7 +470,6 @@ rest of the work for us
 
   include(FindPackageHandleStandardArgs)
   find_package_handle_standard_args(Foo
-    FOUND_VAR Foo_FOUND
     REQUIRED_VARS
       Foo_LIBRARY
       Foo_INCLUDE_DIR
diff --git a/Modules/FindBacktrace.cmake b/Modules/FindBacktrace.cmake
index 4d3186c961..abd01171c0 100644
--- a/Modules/FindBacktrace.cmake
+++ b/Modules/FindBacktrace.cmake
@@ -98,7 +98,7 @@ endif()
 set(Backtrace_LIBRARIES ${Backtrace_LIBRARY})
 set(Backtrace_HEADER "${_Backtrace_HEADER_TRY}" CACHE STRING "Header providing backtrace(3) facility")
 
-find_package_handle_standard_args(Backtrace FOUND_VAR Backtrace_FOUND REQUIRED_VARS ${_Backtrace_STD_ARGS})
+find_package_handle_standard_args(Backtrace REQUIRED_VARS ${_Backtrace_STD_ARGS})
 mark_as_advanced(Backtrace_HEADER Backtrace_INCLUDE_DIR Backtrace_LIBRARY)
 
 if(Backtrace_FOUND AND NOT TARGET Backtrace::Backtrace)
diff --git a/Modules/FindFontconfig.cmake b/Modules/FindFontconfig.cmake
index 1cd84c1de8..8b8066b48a 100644
--- a/Modules/FindFontconfig.cmake
+++ b/Modules/FindFontconfig.cmake
@@ -80,8 +80,6 @@ endif ()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Fontconfig
-  FOUND_VAR
-    Fontconfig_FOUND
   REQUIRED_VARS
     Fontconfig_LIBRARY
     Fontconfig_INCLUDE_DIR
diff --git a/Modules/FindGSL.cmake b/Modules/FindGSL.cmake
index 3bb927211e..dc784cdc02 100644
--- a/Modules/FindGSL.cmake
+++ b/Modules/FindGSL.cmake
@@ -153,8 +153,6 @@ endif()
 # handle the QUIETLY and REQUIRED arguments and set GSL_FOUND to TRUE if all
 # listed variables are TRUE
 find_package_handle_standard_args( GSL
-  FOUND_VAR
-    GSL_FOUND
   REQUIRED_VARS
     GSL_INCLUDE_DIR
     GSL_LIBRARY
diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake
index 543e10c38f..f2b4d5a18d 100644
--- a/Modules/FindIce.cmake
+++ b/Modules/FindIce.cmake
@@ -542,7 +542,6 @@ _Ice_FIND()
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ice
-                                  FOUND_VAR Ice_FOUND
                                   REQUIRED_VARS Ice_SLICE2CPP_EXECUTABLE
                                                 Ice_INCLUDE_DIR
                                                 Ice_SLICE_DIR
diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index 809fec7dfb..7b0671f119 100644
--- a/Modules/FindImageMagick.cmake
+++ b/Modules/FindImageMagick.cmake
@@ -327,8 +327,6 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(ImageMagick
                                   REQUIRED_VARS ${ImageMagick_REQUIRED_VARS}
                                   VERSION_VAR ImageMagick_VERSION_STRING
   )
-# Maintain consistency with all other variables.
-set(ImageMagick_FOUND ${IMAGEMAGICK_FOUND})
 
 #---------------------------------------------------------------------
 # DEPRECATED: Setting variables for backward compatibility.
diff --git a/Modules/FindIntl.cmake b/Modules/FindIntl.cmake
index 04f5a239f8..e2c5a838e9 100644
--- a/Modules/FindIntl.cmake
+++ b/Modules/FindIntl.cmake
@@ -162,7 +162,6 @@ endif()
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Intl
-                                  FOUND_VAR Intl_FOUND
                                   REQUIRED_VARS ${_Intl_REQUIRED_VARS}
                                   VERSION_VAR Intl_VERSION
                                   FAIL_MESSAGE "Failed to find Gettext libintl")
diff --git a/Modules/FindLTTngUST.cmake b/Modules/FindLTTngUST.cmake
index 34b2e82e4d..32c6a16439 100644
--- a/Modules/FindLTTngUST.cmake
+++ b/Modules/FindLTTngUST.cmake
@@ -98,7 +98,7 @@ if(LTTNGUST_INCLUDE_DIRS AND LTTNGUST_LIBRARIES)
 endif()
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-find_package_handle_standard_args(LTTngUST FOUND_VAR LTTNGUST_FOUND
+find_package_handle_standard_args(LTTngUST
                                   REQUIRED_VARS LTTNGUST_LIBRARIES
                                                 LTTNGUST_INCLUDE_DIRS
                                   VERSION_VAR LTTNGUST_VERSION_STRING)
diff --git a/Modules/FindLibinput.cmake b/Modules/FindLibinput.cmake
index 291d828d49..8ed0e4cc86 100644
--- a/Modules/FindLibinput.cmake
+++ b/Modules/FindLibinput.cmake
@@ -60,8 +60,6 @@ find_library(Libinput_LIBRARY
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Libinput
-  FOUND_VAR
-    Libinput_FOUND
   REQUIRED_VARS
     Libinput_LIBRARY
     Libinput_INCLUDE_DIR
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index c94ef72d4f..35f8b4e552 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -2079,7 +2079,6 @@ set(Matlab_VERSION ${Matlab_VERSION_STRING})
 
 find_package_handle_standard_args(
   Matlab
-  FOUND_VAR Matlab_FOUND
   REQUIRED_VARS ${_matlab_required_variables}
   VERSION_VAR Matlab_VERSION
   HANDLE_VERSION_RANGE
diff --git a/Modules/FindOpenCL.cmake b/Modules/FindOpenCL.cmake
index 55be667a86..b3fa1cce0f 100644
--- a/Modules/FindOpenCL.cmake
+++ b/Modules/FindOpenCL.cmake
@@ -176,7 +176,6 @@ set(OpenCL_INCLUDE_DIRS ${OpenCL_INCLUDE_DIR})
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 find_package_handle_standard_args(
   OpenCL
-  FOUND_VAR OpenCL_FOUND
   REQUIRED_VARS OpenCL_LIBRARY OpenCL_INCLUDE_DIR
   VERSION_VAR OpenCL_VERSION_STRING)
 
diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake
index 061ba2fa71..674b161bfb 100644
--- a/Modules/FindOpenMP.cmake
+++ b/Modules/FindOpenMP.cmake
@@ -709,8 +709,6 @@ find_package_handle_standard_args(OpenMP
     VERSION_VAR ${_OpenMP_MIN_VERSION}
     HANDLE_COMPONENTS)
 
-set(OPENMP_FOUND ${OpenMP_FOUND})
-
 if(CMAKE_Fortran_COMPILER_LOADED AND OpenMP_Fortran_FOUND)
   if(NOT DEFINED OpenMP_Fortran_HAVE_OMPLIB_MODULE)
     set(OpenMP_Fortran_HAVE_OMPLIB_MODULE FALSE CACHE BOOL INTERNAL "")
diff --git a/Modules/FindOpenSP.cmake b/Modules/FindOpenSP.cmake
index 4255aefbd4..5cd95705ea 100644
--- a/Modules/FindOpenSP.cmake
+++ b/Modules/FindOpenSP.cmake
@@ -122,7 +122,6 @@ endif ()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(OpenSP
-  FOUND_VAR OpenSP_FOUND
   REQUIRED_VARS OpenSP_LIBRARY OpenSP_INCLUDE_DIR
   VERSION_VAR OpenSP_VERSION
   )
diff --git a/Modules/FindPackageHandleStandardArgs.cmake b/Modules/FindPackageHandleStandardArgs.cmake
index ffa187b1fc..6ffba2eb32 100644
--- a/Modules/FindPackageHandleStandardArgs.cmake
+++ b/Modules/FindPackageHandleStandardArgs.cmake
@@ -56,7 +56,8 @@ implementing :command:`find_package(<PackageName>)` calls.
     Specifies either ``<PackageName>_FOUND`` or
     ``<PACKAGENAME>_FOUND`` as the result variable.  This exists only
     for compatibility with older versions of CMake and is now ignored.
-    Result variables of both names are always set for compatibility.
+    Result variables of both names are now always set for compatibility
+    also with or without this option.
 
   ``REQUIRED_VARS <required-var>...``
     Specify the variables which are required for this package.
@@ -467,13 +468,12 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
   if(FPHSA_FOUND_VAR)
     set(_FOUND_VAR_UPPER ${_NAME_UPPER}_FOUND)
     set(_FOUND_VAR_MIXED ${_NAME}_FOUND)
-    if(FPHSA_FOUND_VAR STREQUAL _FOUND_VAR_MIXED  OR  FPHSA_FOUND_VAR STREQUAL _FOUND_VAR_UPPER)
-      set(_FOUND_VAR ${FPHSA_FOUND_VAR})
-    else()
+    if(
+      NOT FPHSA_FOUND_VAR STREQUAL _FOUND_VAR_MIXED
+      AND NOT FPHSA_FOUND_VAR STREQUAL _FOUND_VAR_UPPER
+    )
       message(FATAL_ERROR "The argument for FOUND_VAR is \"${FPHSA_FOUND_VAR}\", but only \"${_FOUND_VAR_MIXED}\" and \"${_FOUND_VAR_UPPER}\" are valid names.")
     endif()
-  else()
-    set(_FOUND_VAR ${_NAME_UPPER}_FOUND)
   endif()
 
   # collect all variables which were not found, so they can be printed, so the
diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake
index 1984e18ca8..229f364ad0 100644
--- a/Modules/FindPostgreSQL.cmake
+++ b/Modules/FindPostgreSQL.cmake
@@ -274,7 +274,6 @@ find_package_handle_standard_args(PostgreSQL
                                   REQUIRED_VARS PostgreSQL_LIBRARY PostgreSQL_INCLUDE_DIR
                                   HANDLE_COMPONENTS
                                   VERSION_VAR PostgreSQL_VERSION_STRING)
-set(PostgreSQL_FOUND  ${POSTGRESQL_FOUND})
 
 function(__postgresql_import_library _target _var _config)
   if(_config)
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 6d764bda96..91b83c8465 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1325,7 +1325,7 @@ else()
     # explicitly.
     set(FPHSA_NAME_MISMATCHED 1)
   endif ()
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt4 FOUND_VAR Qt4_FOUND
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt4
     REQUIRED_VARS ${_QT4_FOUND_REQUIRED_VARS}
     VERSION_VAR QTVERSION
     )
@@ -1341,5 +1341,4 @@ endif()
 set (QT_MOC_EXE ${QT_MOC_EXECUTABLE} )
 set (QT_UIC_EXE ${QT_UIC_EXECUTABLE} )
 set( QT_QT_LIBRARY "")
-set(QT4_FOUND ${Qt4_FOUND})
 set(QT_FOUND ${Qt4_FOUND})
diff --git a/Modules/FindSubversion.cmake b/Modules/FindSubversion.cmake
index 7a9c440f67..75358545a3 100644
--- a/Modules/FindSubversion.cmake
+++ b/Modules/FindSubversion.cmake
@@ -165,5 +165,4 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Subversion REQUIRED_VARS Subversion_SVN_EXECUT
                                              VERSION_VAR Subversion_VERSION_SVN )
 
 # for compatibility
-set(Subversion_FOUND ${SUBVERSION_FOUND})
 set(Subversion_SVN_FOUND ${SUBVERSION_FOUND})
diff --git a/Modules/FindXCTest.cmake b/Modules/FindXCTest.cmake
index 92ee25d629..d198ad9c6f 100644
--- a/Modules/FindXCTest.cmake
+++ b/Modules/FindXCTest.cmake
@@ -103,7 +103,6 @@ endif()
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 find_package_handle_standard_args(XCTest
-  FOUND_VAR XCTest_FOUND
   REQUIRED_VARS XCTest_LIBRARY XCTest_INCLUDE_DIR XCTest_EXECUTABLE)
 
 if(XCTest_FOUND)
diff --git a/Modules/FindXalanC.cmake b/Modules/FindXalanC.cmake
index 338d0c028b..6d4801ecd9 100644
--- a/Modules/FindXalanC.cmake
+++ b/Modules/FindXalanC.cmake
@@ -115,7 +115,6 @@ unset(XalanC_XERCESC_REQUIRED)
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(XalanC
-                                  FOUND_VAR XalanC_FOUND
                                   REQUIRED_VARS XalanC_LIBRARY
                                                 XalanC_INCLUDE_DIR
                                                 XalanC_VERSION
diff --git a/Modules/FindXercesC.cmake b/Modules/FindXercesC.cmake
index ee6a4015c5..8eaed02c81 100644
--- a/Modules/FindXercesC.cmake
+++ b/Modules/FindXercesC.cmake
@@ -113,7 +113,6 @@ unset(XercesC_VERSION_PATCH)
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(XercesC
-                                  FOUND_VAR XercesC_FOUND
                                   REQUIRED_VARS XercesC_LIBRARY
                                                 XercesC_INCLUDE_DIR
                                                 XercesC_VERSION
diff --git a/Source/Modules/FindJsonCpp.cmake b/Source/Modules/FindJsonCpp.cmake
index 1951b6154a..74fa181768 100644
--- a/Source/Modules/FindJsonCpp.cmake
+++ b/Source/Modules/FindJsonCpp.cmake
@@ -85,11 +85,9 @@ unset(_JsonCpp_H)
 #-----------------------------------------------------------------------------
 include(${CMAKE_CURRENT_LIST_DIR}/../../Modules/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(JsonCpp
-  FOUND_VAR JsonCpp_FOUND
   REQUIRED_VARS JsonCpp_LIBRARY JsonCpp_INCLUDE_DIR
   VERSION_VAR JsonCpp_VERSION_STRING
   )
-set(JSONCPP_FOUND ${JsonCpp_FOUND})
 
 #-----------------------------------------------------------------------------
 # Provide documented result variables and targets.
diff --git a/Source/Modules/FindLibRHash.cmake b/Source/Modules/FindLibRHash.cmake
index 86c6189f30..c23a028e06 100644
--- a/Source/Modules/FindLibRHash.cmake
+++ b/Source/Modules/FindLibRHash.cmake
@@ -53,10 +53,8 @@ mark_as_advanced(LibRHash_INCLUDE_DIR)
 #-----------------------------------------------------------------------------
 include(${CMAKE_CURRENT_LIST_DIR}/../../Modules/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibRHash
-  FOUND_VAR LibRHash_FOUND
   REQUIRED_VARS LibRHash_LIBRARY LibRHash_INCLUDE_DIR
   )
-set(LIBRHASH_FOUND ${LibRHash_FOUND})
 
 #-----------------------------------------------------------------------------
 # Provide documented result variables and targets.
diff --git a/Source/Modules/FindLibUUID.cmake b/Source/Modules/FindLibUUID.cmake
index ca5b61d1c8..28bbec2fb9 100644
--- a/Source/Modules/FindLibUUID.cmake
+++ b/Source/Modules/FindLibUUID.cmake
@@ -72,10 +72,8 @@ mark_as_advanced(LibUUID_INCLUDE_DIR)
 #-----------------------------------------------------------------------------
 include(${CMAKE_CURRENT_LIST_DIR}/../../Modules/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibUUID
-  FOUND_VAR LibUUID_FOUND
   REQUIRED_VARS LibUUID_LIBRARY LibUUID_INCLUDE_DIR
   )
-set(LIBUUID_FOUND ${LibUUID_FOUND})
 
 #-----------------------------------------------------------------------------
 # Provide documented result variables and targets.
diff --git a/Source/Modules/FindLibUV.cmake b/Source/Modules/FindLibUV.cmake
index 0554d62c23..9baeb824bb 100644
--- a/Source/Modules/FindLibUV.cmake
+++ b/Source/Modules/FindLibUV.cmake
@@ -102,11 +102,9 @@ unset(_LibUV_H)
 #-----------------------------------------------------------------------------
 include(${CMAKE_CURRENT_LIST_DIR}/../../Modules/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibUV
-  FOUND_VAR LibUV_FOUND
   REQUIRED_VARS LibUV_LIBRARY LibUV_INCLUDE_DIR
   VERSION_VAR LibUV_VERSION
   )
-set(LIBUV_FOUND ${LibUV_FOUND})
 
 #-----------------------------------------------------------------------------
 # Provide documented result variables and targets.