Clean up find_package flag handling in Find modules

dyninst · Dec 22, 2022 · 7c6b34f · 7c6b34f
1 parent 1e312b4
commit 7c6b34f
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 43 deletions.
diff --git a/cmake/Modules/FindLibDW.cmake b/cmake/Modules/FindLibDW.cmake
@@ -29,17 +29,18 @@ This module will set the following variables in your project:
 #]=======================================================================]
 cmake_policy(SET CMP0074 NEW) # Use <Package>_ROOT
 
-if(LibDW_FIND_QUIETLY)
-    set(_quiet "QUIET")
-endif()
-
-if(NOT "x${LibDW_FIND_VERSION}" STREQUAL "x")
-    set(_version ">=${LibDW_FIND_VERSION}")
-endif()
-
 find_package(PkgConfig QUIET)
 if(PKG_CONFIG_FOUND)
+		if(NOT "x${LibDW_FIND_VERSION}" STREQUAL "x")
+		    set(_version ">=${LibDW_FIND_VERSION}")
+		endif()
+		if(LibDW_FIND_QUIETLY)
+		    set(_quiet "QUIET")
+		endif()
+
     pkg_check_modules(PC_LIBDW ${_quiet} "libdw${_version}")
+    unset(_version)
+    unset(_quiet)
 endif()
 
 if(PC_LIBDW_FOUND)
@@ -127,6 +128,3 @@ if(LibDW_FOUND)
                                     IMPORTED_LOCATION "${LibDW_LIBRARIES}")
     endif()
 endif()
-
-unset(_quiet)
-unset(_version)
diff --git a/cmake/Modules/FindLibDebuginfod.cmake b/cmake/Modules/FindLibDebuginfod.cmake
@@ -29,17 +29,18 @@ This module will set the following variables in your project:
 #]=======================================================================]
 cmake_policy(SET CMP0074 NEW) # Use <Package>_ROOT
 
-if(LibDebuginfod_FIND_QUIETLY)
-    set(_quiet "QUIET")
-endif()
-
-if(NOT "x${LibDebuginfod_FIND_VERSION}" STREQUAL "x")
-    set(_version ">=${LibDebuginfod_FIND_VERSION}")
-endif()
-
 find_package(PkgConfig QUIET)
 if(PKG_CONFIG_FOUND)
+		if(NOT "x${LibDebuginfod_FIND_VERSION}" STREQUAL "x")
+		    set(_version ">=${LibDebuginfod_FIND_VERSION}")
+		endif()
+		if(LibDebuginfod_FIND_QUIETLY)
+		    set(_quiet "QUIET")
+		endif()
+
     pkg_check_modules(PC_LIBDEBUGINFOD ${_quiet} "libdebuginfod${_version}")
+    unset(_version)
+    unset(_quiet)
 endif()
 
 if(PC_LIBDEBUGINFOD_FOUND)
@@ -107,6 +108,3 @@ if(LibDebuginfod_FOUND)
                                                              "${LibDebuginfod_LIBRARIES}")
     endif()
 endif()
-
-unset(_quiet)
-unset(_version)
diff --git a/cmake/Modules/FindLibELF.cmake b/cmake/Modules/FindLibELF.cmake
@@ -29,17 +29,18 @@ This module will set the following variables in your project:
 #]=======================================================================]
 cmake_policy(SET CMP0074 NEW) # Use <Package>_ROOT
 
-if(LibELF_FIND_QUIETLY)
-    set(_quiet "QUIET")
-endif()
-
-if(NOT "x${LibELF_FIND_VERSION}" STREQUAL "x")
-    set(_version ">=${LibELF_FIND_VERSION}")
-endif()
-
 find_package(PkgConfig QUIET)
 if(PKG_CONFIG_FOUND)
+		if(NOT "x${LibELF_FIND_VERSION}" STREQUAL "x")
+		    set(_version ">=${LibELF_FIND_VERSION}")
+		endif()
+		if(LibELF_FIND_QUIETLY)
+		    set(_quiet "QUIET")
+		endif()
+
     pkg_check_modules(PC_LIBELF ${_quiet} "libelf${_version}")
+    unset(_version)
+    unset(_quiet)
 endif()
 
 if(PC_LIBELF_FOUND)
@@ -111,6 +112,3 @@ if(LibELF_FOUND)
                                       IMPORTED_LOCATION "${LibELF_LIBRARIES}")
     endif()
 endif()
-
-unset(_quiet)
-unset(_version)
diff --git a/cmake/Modules/FindValgrind.cmake b/cmake/Modules/FindValgrind.cmake
@@ -27,17 +27,18 @@ This module will set the following variables in your project:
 #]=======================================================================]
 cmake_policy(SET CMP0074 NEW) # Use <Package>_ROOT
 
-if(Valgrind_FIND_QUIETLY)
-    set(_quiet "QUIET")
-endif()
-
-if(NOT "x${Valgrind_FIND_VERSION}" STREQUAL "x")
-    set(_version ">=${Valgrind_FIND_VERSION}")
-endif()
-
 find_package(PkgConfig QUIET)
 if(PKG_CONFIG_FOUND)
+		if(NOT "x${Valgrind_FIND_VERSION}" STREQUAL "x")
+		    set(_version ">=${Valgrind_FIND_VERSION}")
+		endif()
+		if(Valgrind_FIND_QUIETLY)
+		    set(_quiet "QUIET")
+		endif()
+
     pkg_check_modules(PC_VALGRIND ${_quiet} "valgrind${_version}")
+    unset(_version)
+    unset(_quiet)
 endif()
 
 if(PC_VALGRIND_FOUND)
@@ -90,5 +91,3 @@ find_package_handle_standard_args(
     VERSION_VAR Valgrind_VERSION)
 
 mark_as_advanced(Valgrind_INCLUDE_DIRS)
-unset(_quiet)
-unset(_version)