diff options
| author | Sebastian Parborg <darkdefende@gmail.com> | 2019-07-31 17:15:38 +0300 |
|---|---|---|
| committer | Sebastian Parborg <darkdefende@gmail.com> | 2019-07-31 17:18:17 +0300 |
| commit | fb03a86b1bff047f95d42f9c23619cb9a89c9827 (patch) | |
| tree | 9314c007b5f9e3fc9185ac573f85b8df28a19f85 /CMakeLists.txt | |
| parent | b0531227d40e2b4c147367fe87e311efd92de80d (diff) | |
Have CMake be more strict when optional x11 libraries are missing but enabled
Previously cmake would silently disable features that depended on
certain x11 libraries if they were not found. Now we instead error out
and inform the user that these are missing but optional.
Reviewed By: Brecht
Differential Revision: http://developer.blender.org/D5380
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4dd165b0185..f0ca98c44a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -852,7 +852,8 @@ if(WITH_X11) if(X11_Xinput_LIB) list(APPEND PLATFORM_LINKLIBS ${X11_Xinput_LIB}) else() - set(WITH_X11_XINPUT OFF) + message(FATAL_ERROR "LibXi not found. Disable WITH_X11_XINPUT if you + want to build without tablet support") endif() endif() @@ -863,7 +864,8 @@ if(WITH_X11) if(X11_Xxf86vmode_LIB) list(APPEND PLATFORM_LINKLIBS ${X11_Xxf86vmode_LIB}) else() - set(WITH_X11_XF86VMODE OFF) + message(FATAL_ERROR "libXxf86vm not found. Disable WITH_X11_XF86VMODE if you + want to build without") endif() endif() @@ -871,7 +873,8 @@ if(WITH_X11) if(X11_Xfixes_LIB) list(APPEND PLATFORM_LINKLIBS ${X11_Xfixes_LIB}) else() - set(WITH_X11_XFIXES OFF) + message(FATAL_ERROR "libXfixes not found. Disable WITH_X11_XFIXES if you + want to build without") endif() endif() @@ -881,7 +884,8 @@ if(WITH_X11) if(X11_Xrender_LIB) list(APPEND PLATFORM_LINKLIBS ${X11_Xrender_LIB}) else() - set(WITH_X11_ALPHA OFF) + message(FATAL_ERROR "libXrender not found. Disable WITH_X11_ALPHA if you + want to build without") endif() endif() |