From cc41a48baff8d13bcd10cd96879ffdcf29beb1f2 Mon Sep 17 00:00:00 2001
From: Jose Fonseca <jfonseca@vmware.com>
Date: Fri, 13 Mar 2015 10:35:27 +0000
Subject: [PATCH] cmake: Use FindPackageHandleStandardArgs for finding procps.

---
 CMakeLists.txt         |  2 +-
 cmake/Findprocps.cmake | 21 +++++++--------------
 retrace/CMakeLists.txt |  4 ++--
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2cfb6e94..bfb69ad9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,7 +112,7 @@ find_package (Threads)
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     find_package (procps)
-    if (procps_FOUND)
+    if (PROCPS_FOUND)
         add_definitions (-DHAVE_READPROC_H)
     endif ()
 endif ()
diff --git a/cmake/Findprocps.cmake b/cmake/Findprocps.cmake
index d73496d6..e614d7cd 100644
--- a/cmake/Findprocps.cmake
+++ b/cmake/Findprocps.cmake
@@ -2,22 +2,15 @@
 #
 # Once done this will define:
 #
-#  procps_FOUND
-#  procps_INCLUDE_DIR
-#  procps_LIBRARY
+#  PROCPS_FOUND
+#  PROCPS_INCLUDE_DIR
+#  PROCPS_LIBRARY
 #
 
-include (FindPackageMessage)
+include (FindPackageHandleStandardArgs)
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    find_path (procps_INCLUDE_DIR proc/readproc.h)
-    find_library (procps_LIBRARY NAMES proc procps)
-    if (procps_INCLUDE_DIR AND procps_LIBRARY)
-        set (procps_FOUND 1)
-        mark_as_advanced (procps_FOUND)
-        find_package_message (procps "Found procps" "[${procps_LIBRARY}][${procps_INCLUDE_DIR}]")
-    else ()
-        find_package_message (procps "procps not found" "[${procps_LIBRARY}][${procps_INCLUDE_DIR}]")
-    endif ()
+    find_path (PROCPS_INCLUDE_DIR proc/readproc.h)
+    find_library (PROCPS_LIBRARY NAMES proc procps)
+    find_package_handle_standard_args (procps DEFAULT_MSG PROCPS_LIBRARY PROCPS_INCLUDE_DIR)
 endif()
-
diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
index efd2e02d..f164a6c6 100644
--- a/retrace/CMakeLists.txt
+++ b/retrace/CMakeLists.txt
@@ -74,8 +74,8 @@ add_dependencies (glretrace_common glproc)
 target_link_libraries (glretrace_common
     retrace_common
 )
-if (procps_FOUND)
-    target_link_libraries (glretrace_common ${procps_LIBRARY})
+if (PROCPS_FOUND)
+    target_link_libraries (glretrace_common ${PROCPS_LIBRARY})
 endif ()