cmake: Use find_package to find X11 libraries

diff --git a/src/glxspheres/CMakeLists.txt b/src/glxspheres/CMakeLists.txt
index 4676ab4fcd7ecd42ed2d05532ff0b310b9a0f05e..e96910ee33ad3c48c157e7c3403df930f4f39d4f 100644 (file)
--- 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 8ea8bfb8b28951d8858bfa977434e71bf3bed94a..52f9e62d26a6928deb026f40637bfe9a536bf4e7 100644 (file)
--- 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 5a9772656a9e7a29aecc83d4a8ed644121f6065e..6a19603a67814515fa5c6d0456a02bd9be367a66 100644 (file)
--- 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 fca718cf87fbb94489bcffbfb2b681a979cac660..fc2a795536148ab06cf247eb04a57a7a2c4af76c 100644 (file)
--- 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 818dada96aa66833f81588294ccca7c93c926712..d15fcc06f2f335cae528c39fc6a853e02062ab26 100644 (file)
--- 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
     )