From 12abbd9205f71a113780694dba493b06d66bd38c Mon Sep 17 00:00:00 2001 From: Ryan Foster Date: Sun, 3 Dec 2017 19:10:34 -0500 Subject: [PATCH] cmake: Correct CMake checks for LINUX Some CMake checks were recently switched from UNIX to LINUX to get them to not apply to macOS/OSX. Since LINUX doesn't seem to be defined, switch these checks to UNIX AND NOT APPLE. --- UI/frontend-plugins/frontend-tools/CMakeLists.txt | 2 +- deps/glad/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/UI/frontend-plugins/frontend-tools/CMakeLists.txt b/UI/frontend-plugins/frontend-tools/CMakeLists.txt index bc0cae122..6c8441216 100644 --- a/UI/frontend-plugins/frontend-tools/CMakeLists.txt +++ b/UI/frontend-plugins/frontend-tools/CMakeLists.txt @@ -5,7 +5,7 @@ if(APPLE) include_directories(${COCOA}) endif() -if(LINUX) +if(UNIX AND NOT APPLE) find_package(X11 REQUIRED) link_libraries(${X11_LIBRARIES}) include_directories(${X11_INCLUDE_DIR}) diff --git a/deps/glad/CMakeLists.txt b/deps/glad/CMakeLists.txt index 90e35fb2e..79c4d3b3c 100644 --- a/deps/glad/CMakeLists.txt +++ b/deps/glad/CMakeLists.txt @@ -23,7 +23,7 @@ endif() set(glad_include_dirs PRIVATE ${OPENGL_INCLUDE_DIR}) -if (LINUX) +if (UNIX AND NOT APPLE) list (APPEND glad_include_dirs PRIVATE ${X11_X11_INCLUDE_PATH}) endif()