mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-19 17:49:14 +00:00
Merge pull request #1103 from RytoEX/fix-ci-linux
cmake: Correct CMake checks for LINUX
This commit is contained in:
commit
46d54ce68a
|
@ -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
2
deps/glad/CMakeLists.txt
vendored
|
@ -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()
|
||||
|
|
Loading…
Reference in a new issue