From 1cda776e2374482e35e4e4939d07f75314fb371c Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Wed, 28 Oct 2015 00:32:05 +0000
Subject: [PATCH] Attempt to use the "system" xpdev, and fall back to the one
 in the magical path only if needed.

---
 src/conio/CMakeLists.txt | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/conio/CMakeLists.txt b/src/conio/CMakeLists.txt
index 7146a447f2..3ea57c0b92 100644
--- a/src/conio/CMakeLists.txt
+++ b/src/conio/CMakeLists.txt
@@ -2,12 +2,12 @@ project (ConIOLib C)
 
 cmake_minimum_required(VERSION 2.8.11)
 
-INCLUDE(../build/SynchronetMacros.cmake)
 INCLUDE (CheckFunctionExists)
 INCLUDE (FindSDL)
 INCLUDE (FindX11)
 INCLUDE (FindCurses)
 INCLUDE (FindThreads)
+find_package(XPDev QUIET CONFIG PATHS lib/cmake/XPDev)
 
 set(SOURCE
 	ansi_cio.c
@@ -50,7 +50,12 @@ if(NEED_BITMAP)
 endif()
 
 add_library(ciolib SHARED ${SOURCE})
-require_lib(ciolib xpdev)
+if(XPDev_FOUND)
+	target_link_libraries(ciolib xpdev)
+else()
+	INCLUDE(../build/SynchronetMacros.cmake)
+	require_lib(ciolib xpdev)
+endif()
 target_compile_definitions(ciolib PRIVATE CIOLIB_EXPORTS)
 target_compile_definitions(ciolib INTERFACE CIOLIB_IMPORTS)
 
-- 
GitLab