From b280905b8c6cc4dcf8ec49b95bd09ab1ed679838 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Mon, 15 Jun 2020 22:03:08 +0200 Subject: [PATCH] Fix CMake 5.17+ FPHSA warning Starting with CMake 5.17 FindPackageHandleStandardArgs is detecting package name mismatches. Also capitalization is checked. See: https://gitlab.kitware.com/cmake/cmake/-/commit/ee4673c1ae1e4a1aa4687412717567c2ffbb501b --- CMakeModules/FindDBus.cmake | 4 ++-- CMakeModules/FindLibEvent.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeModules/FindDBus.cmake b/CMakeModules/FindDBus.cmake index 09753d24e..389c3a90f 100644 --- a/CMakeModules/FindDBus.cmake +++ b/CMakeModules/FindDBus.cmake @@ -16,7 +16,7 @@ if(WIN32) ) endif() else() - include(FindPkgConfig) + find_package(PkgConfig QUIET) if(PKG_CONFIG_FOUND) # FIXME : clean this up once we requrie CMake 3.6 @@ -33,5 +33,5 @@ else() endif(WIN32) include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(DBUS DEFAULT_MSG +FIND_PACKAGE_HANDLE_STANDARD_ARGS(DBus DEFAULT_MSG DBUS_INCLUDE_DIRS DBUS_LIBRARIES) \ No newline at end of file diff --git a/CMakeModules/FindLibEvent.cmake b/CMakeModules/FindLibEvent.cmake index a58202d5b..fe376edfb 100644 --- a/CMakeModules/FindLibEvent.cmake +++ b/CMakeModules/FindLibEvent.cmake @@ -8,5 +8,5 @@ FIND_PATH(LIBEVENT_INCLUDE_DIR event2/event.h PATH_SUFFIXES include HINTS ${ADDI FIND_LIBRARY(LIBEVENT_LIB NAMES event_core PATH_SUFFIXES lib HINTS ${ADDITIONAL_LIBRARY_PATHS}) include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBEVENT DEFAULT_MSG +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibEvent DEFAULT_MSG LIBEVENT_INCLUDE_DIR LIBEVENT_LIB) \ No newline at end of file