[PATCH] Check for libproc library name

Arthur Huillet arthur.huillet at free.fr
Tue Mar 19 13:04:04 PDT 2013


On Tue, 19 Mar 2013 20:46:57 +0100
Laurent Carlier <lordheavym at gmail.com> wrote:

> libprocps can be replaced with libprocps-ng, so check for the proper library
> name. This fix building with ArchLinux.

Reviewed-by: Arthur Huillet <arthur.huillet at free.fr>
> ---
>  CMakeLists.txt         | 1 +
>  retrace/CMakeLists.txt | 4 ++--
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 3b932e1..da951c2 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -195,6 +195,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
>      if (READPROC_H_FOUND)
>          add_definitions (-DHAVE_READPROC_H)
>      endif ()
> +    find_library (proc_LIBRARY NAMES proc procps)
>  endif()
>  
>  if (WIN32 OR APPLE)
> 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 ()
>  
> -- 
> 1.8.2
> 
> _______________________________________________
> apitrace mailing list
> apitrace at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/apitrace


-- 
Greetings, 
A. Huillet


More information about the apitrace mailing list