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

cmake: Do not require X11 on OSX

Browse Source
This commit is contained in:
Colin Edwards 2017-12-02 21:50:32 -06:00
parent 51bd92b20e
commit fcea48490f
2 changed files with 10 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(UNIX)
if(LINUX)
find_package(X11 REQUIRED)
link_libraries(${X11_LIBRARIES})
include_directories(${X11_INCLUDE_DIR})

10
deps/glad/CMakeLists.txt vendored
View File

@ -20,6 +20,14 @@ elseif(NOT APPLE)
include/glad/glad_glx.h)
endif()
set(glad_include_dirs
PRIVATE ${OPENGL_INCLUDE_DIR})
if (LINUX)
list (APPEND glad_include_dirs
PRIVATE ${X11_X11_INCLUDE_PATH})
endif()
add_library(glad SHARED
${glad_SOURCES}
${glad_PLATFORM_SOURCES})
@ -29,7 +37,7 @@ set_target_properties(glad PROPERTIES
SOVERSION "0")
target_include_directories(glad
PUBLIC include
PRIVATE ${X11_X11_INCLUDE_PATH} ${OPENGL_INCLUDE_DIR})
${glad_include_dirs})
target_compile_definitions(glad
PRIVATE GLAD_GLAPI_EXPORT_BUILD)