From f89afaa335fef6cb5f40167436c09d5df6dd4126 Mon Sep 17 00:00:00 2001 From: M <1999714+Martinfx@users.noreply.github.com> Date: Sat, 26 May 2018 20:56:24 +0200 Subject: CMake: Fix cannot find -lX11 (#552) Temporary measure to fix a breakage on FreeBSD. See #551 for more details. --- cmake/utils.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'cmake') diff --git a/cmake/utils.cmake b/cmake/utils.cmake index fc75ef4f..9a2b410f 100755 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -53,6 +53,11 @@ if(${PLATFORM} MATCHES "Desktop") endif() endif() +# Ugly crutch. Temporary workaround for #551 +if("${CMAKE_SYSTEM_NAME}" MATCHES "(Free|Net|Open)BSD") + link_directories("/usr/local/lib") +endif() + if(CMAKE_SYSTEM_NAME STREQUAL Linux) set(LINUX TRUE) set(LIBS_PRIVATE dl ${LIBS_PRIVATE}) -- cgit v1.2.3 From 965cc8ab6fab12fdab1ddd78b9a8e5eb146f3282 Mon Sep 17 00:00:00 2001 From: "maficccc@gmail.com" Date: Fri, 22 Jun 2018 23:31:22 +0200 Subject: Added support DragonFly os from BSD family --- cmake/utils.cmake | 4 ++-- src/rglfw.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'cmake') diff --git a/cmake/utils.cmake b/cmake/utils.cmake index 9a2b410f..7801a1cc 100755 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -54,8 +54,8 @@ if(${PLATFORM} MATCHES "Desktop") endif() # Ugly crutch. Temporary workaround for #551 -if("${CMAKE_SYSTEM_NAME}" MATCHES "(Free|Net|Open)BSD") - link_directories("/usr/local/lib") +if("${CMAKE_SYSTEM_NAME}" MATCHES "(Free|Net|Open)BSD|DragonFly") + link_directories("${CMAKE_INSTALL_PREFIX}/lib") endif() if(CMAKE_SYSTEM_NAME STREQUAL Linux) diff --git a/src/rglfw.c b/src/rglfw.c index e1b5392e..50d606d4 100644 --- a/src/rglfw.c +++ b/src/rglfw.c @@ -37,7 +37,7 @@ #define _GLFW_X11 #endif #endif -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) #define _GLFW_X11 #endif #if defined(__APPLE__) @@ -91,7 +91,7 @@ #include "external/glfw/src/osmesa_context.c" #endif -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__) || defined(__DragonFly__) #include "external/glfw/src/x11_init.c" #include "external/glfw/src/x11_monitor.c" #include "external/glfw/src/x11_window.c" -- cgit v1.2.3