jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1103 from RytoEX/fix-ci-linux 

cmake: Correct CMake checks for LINUX
master
Jim 2017-12-04 10:02:28 -08:00 committed by GitHub
parent 0daade5f8f 12abbd9205
commit 46d54ce68a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/frontend-plugins/frontend-tools/CMakeLists.txt
View File

@ -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})

2
deps/glad/CMakeLists.txt vendored
View File

@ -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()