From 12e1f987f7af2fb66dc6d28ab50f913d6e54a141 Mon Sep 17 00:00:00 2001 From: Laurent Carlier Date: Tue, 19 Mar 2013 20:46:57 +0100 Subject: [PATCH] cmake: Check for libproc library name MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit libprocps can be replaced with libprocps-ng, so check for the proper library name. This fix building with ArchLinux. Reviewed-by: Arthur Huillet Signed-off-by: José Fonseca --- CMakeLists.txt | 1 + retrace/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b932e1..ccaddd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -194,6 +194,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") CHECK_INCLUDE_FILES(proc/readproc.h READPROC_H_FOUND) if (READPROC_H_FOUND) add_definitions (-DHAVE_READPROC_H) + find_library (proc_LIBRARY NAMES proc procps) endif () endif() diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt index 57d5d12..913c23e 100644 --- a/retrace/CMakeLists.txt +++ b/retrace/CMakeLists.txt @@ -103,7 +103,7 @@ if (WIN32 OR APPLE OR X11_FOUND) if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") target_link_libraries (glretrace rt) if (READPROC_H_FOUND) - target_link_libraries (glretrace proc) + target_link_libraries (glretrace ${proc_LIBRARY}) endif () endif () @@ -131,7 +131,7 @@ if (ENABLE_EGL AND X11_FOUND AND NOT WIN32 AND NOT APPLE) if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") target_link_libraries (eglretrace rt) if (READPROC_H_FOUND) - target_link_libraries (eglretrace proc) + target_link_libraries (eglretrace ${proc_LIBRARY}) endif () endif () -- 2.43.0