Skip to content
Snippets Groups Projects
Commit 64c6736e authored by Campbell Barton's avatar Campbell Barton
Browse files

disable xinerama and xinput if libraries are missing.

parent d319d68c
Branches blender-v2.90-release
Tags v2.90.0 v2.90.1
No related merge requests found
...@@ -799,11 +799,19 @@ if(UNIX AND NOT APPLE) ...@@ -799,11 +799,19 @@ if(UNIX AND NOT APPLE)
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_X11_LIB}") set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_X11_LIB}")
if(WITH_X11_XINPUT) if(WITH_X11_XINPUT)
if(X11_Xinput_LIB)
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}") set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}")
else()
set(WITH_X11_XINPUT OFF)
endif()
endif() endif()
if(WITH_X11_XINERAMA) if(WITH_X11_XINERAMA)
if(X11_Xinerama_LIB)
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinerama_LIB}") set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinerama_LIB}")
else()
set(WITH_X11_XINERAMA OFF)
endif()
endif() endif()
if(WITH_X11_XF86VMODE) if(WITH_X11_XF86VMODE)
...@@ -2138,6 +2146,7 @@ if(FIRST_RUN) ...@@ -2138,6 +2146,7 @@ if(FIRST_RUN)
info_cfg_option(WITH_INSTALL_PORTABLE) info_cfg_option(WITH_INSTALL_PORTABLE)
info_cfg_option(WITH_X11_XF86VMODE) info_cfg_option(WITH_X11_XF86VMODE)
info_cfg_option(WITH_X11_XINPUT) info_cfg_option(WITH_X11_XINPUT)
info_cfg_option(WITH_X11_XINERAMA)
info_cfg_option(WITH_MEM_JEMALLOC) info_cfg_option(WITH_MEM_JEMALLOC)
info_cfg_option(WITH_SYSTEM_GLEW) info_cfg_option(WITH_SYSTEM_GLEW)
info_cfg_option(WITH_SYSTEM_OPENJPEG) info_cfg_option(WITH_SYSTEM_OPENJPEG)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment