From 5f0c7ee451e8d431ab9d7676695b3fab85df405c Mon Sep 17 00:00:00 2001
From: Andrew Wong <andrew.kw.w@gmail.com>
Date: Fri, 14 Mar 2014 11:41:50 -0400
Subject: [PATCH] cmake: Use find_package to find X11 libraries

---
 src/glxspheres/CMakeLists.txt | 3 ++-
 src/voglbench/CMakeLists.txt  | 3 ++-
 src/voglreplay/CMakeLists.txt | 3 ++-
 src/vogltest/CMakeLists.txt   | 3 ++-
 src/vogltrace/CMakeLists.txt  | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/glxspheres/CMakeLists.txt b/src/glxspheres/CMakeLists.txt
index 4676ab4..e96910e 100644
--- a/src/glxspheres/CMakeLists.txt
+++ b/src/glxspheres/CMakeLists.txt
@@ -2,6 +2,7 @@ project(glxspheres)
 cmake_minimum_required(VERSION 2.8)
 
 include("${SRC_DIR}/build_options.cmake")
+find_package(X11 REQUIRED)
 
 aux_source_directory(. SRC_LIST)
 
@@ -12,7 +13,7 @@ include_directories(
 add_executable(${PROJECT_NAME} ${SRC_LIST})
 
 target_link_libraries(${PROJECT_NAME}
-    X11
+    ${X11_X11_LIB}
     ${OPENGL_LIBRARY}
     m
     GLU)
diff --git a/src/voglbench/CMakeLists.txt b/src/voglbench/CMakeLists.txt
index 8ea8bfb..52f9e62 100644
--- a/src/voglbench/CMakeLists.txt
+++ b/src/voglbench/CMakeLists.txt
@@ -2,6 +2,7 @@ project(voglbench)
 cmake_minimum_required(VERSION 2.8)
 
 include("${SRC_DIR}/build_options.cmake")
+find_package(X11 REQUIRED)
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
@@ -23,7 +24,7 @@ target_link_libraries(${PROJECT_NAME}
     backtrace
     voglcommon
     ${CMAKE_DL_LIBS}
-    X11
+    ${X11_X11_LIB}
     voglcore
     rt
     )
diff --git a/src/voglreplay/CMakeLists.txt b/src/voglreplay/CMakeLists.txt
index 5a97726..6a19603 100644
--- a/src/voglreplay/CMakeLists.txt
+++ b/src/voglreplay/CMakeLists.txt
@@ -2,6 +2,7 @@ project(voglreplay)
 cmake_minimum_required(VERSION 2.8)
 
 include("${SRC_DIR}/build_options.cmake")
+find_package(X11 REQUIRED)
 
 
 include_directories(
@@ -33,7 +34,7 @@ target_link_libraries(${PROJECT_NAME}
     backtrace
     voglcommon
     ${CMAKE_DL_LIBS}
-    X11
+    ${X11_X11_LIB}
     pthread
     voglcore
     rt
diff --git a/src/vogltest/CMakeLists.txt b/src/vogltest/CMakeLists.txt
index fca718c..fc2a795 100644
--- a/src/vogltest/CMakeLists.txt
+++ b/src/vogltest/CMakeLists.txt
@@ -2,6 +2,7 @@ project(vogltest)
 cmake_minimum_required(VERSION 2.8)
 
 include("${SRC_DIR}/build_options.cmake")
+find_package(X11 REQUIRED)
 
 option(VOGLTEST_LOAD_LIBVOGLTRACE "If enabled vogltest will load libvogltrace.so manually and not implictly link against libgl.so" FALSE)
 
@@ -27,7 +28,7 @@ add_executable(${PROJECT_NAME} ${SRC_LIST})
 
 target_link_libraries(${PROJECT_NAME}
     voglcore
-    X11
+    ${X11_X11_LIB}
     ${VOGLTEST_OPENGL_LIBRARY}
     ${CMAKE_DL_LIBS}
     )
diff --git a/src/vogltrace/CMakeLists.txt b/src/vogltrace/CMakeLists.txt
index 818dada..d15fcc0 100644
--- a/src/vogltrace/CMakeLists.txt
+++ b/src/vogltrace/CMakeLists.txt
@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 2.8)
 option(VOGLTRACE_NO_PUBLIC_EXPORTS "Don't define any public GL exports in libvogltraceXX.so, this .so will only be useful for manual loading" FALSE)
 
 include("${SRC_DIR}/build_options.cmake")
+find_package(X11 REQUIRED)
 
 project(vogltrace)
 
@@ -52,7 +53,7 @@ target_link_libraries(${PROJECT_NAME}
     voglcore
     pthread
     ${CMAKE_DL_LIBS}
-    X11
+    ${X11_X11_LIB}
     libturbojpeg.a
     rt
     )
-- 
2.43.0