diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-02-05 17:30:26 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-02-05 17:30:26 +0300 |
| commit | 6d10c2406297cf93238129b5e704a7ba7e8ce3bc (patch) | |
| tree | 31ca326ab2cf599156f73a321bec7539203c9162 /CMakeLists.txt | |
| parent | 87c18fbbc532fd7e92eeec209a3ff559757548eb (diff) | |
Fix finding freetype on Linux not using pre-compiled libs
Finding X11 before platform libs caused freetype not to use
pre-compiled libraries.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2bac16c339a..b5b19096506 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -793,61 +793,6 @@ if(NOT CMAKE_BUILD_TYPE MATCHES "Release") endif() endif() -#----------------------------------------------------------------------------- -# Platform specifics - -if(WITH_X11) - find_package(X11 REQUIRED) - - find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH}) - mark_as_advanced(X11_XF86keysym_INCLUDE_PATH) - - list(APPEND PLATFORM_LINKLIBS ${X11_X11_LIB}) - - if(WITH_X11_XINPUT) - if(X11_Xinput_LIB) - list(APPEND PLATFORM_LINKLIBS ${X11_Xinput_LIB}) - else() - message(FATAL_ERROR "LibXi not found. Disable WITH_X11_XINPUT if you - want to build without tablet support") - endif() - endif() - - if(WITH_X11_XF86VMODE) - # XXX, why doesn't cmake make this available? - find_library(X11_Xxf86vmode_LIB Xxf86vm ${X11_LIB_SEARCH_PATH}) - mark_as_advanced(X11_Xxf86vmode_LIB) - if(X11_Xxf86vmode_LIB) - list(APPEND PLATFORM_LINKLIBS ${X11_Xxf86vmode_LIB}) - else() - message(FATAL_ERROR "libXxf86vm not found. Disable WITH_X11_XF86VMODE if you - want to build without") - endif() - endif() - - if(WITH_X11_XFIXES) - if(X11_Xfixes_LIB) - list(APPEND PLATFORM_LINKLIBS ${X11_Xfixes_LIB}) - else() - message(FATAL_ERROR "libXfixes not found. Disable WITH_X11_XFIXES if you - want to build without") - endif() - endif() - - if(WITH_X11_ALPHA) - find_library(X11_Xrender_LIB Xrender ${X11_LIB_SEARCH_PATH}) - mark_as_advanced(X11_Xrender_LIB) - if(X11_Xrender_LIB) - list(APPEND PLATFORM_LINKLIBS ${X11_Xrender_LIB}) - else() - message(FATAL_ERROR "libXrender not found. Disable WITH_X11_ALPHA if you - want to build without") - endif() - endif() - -endif() - - # ---------------------------------------------------------------------------- # Main Platform Checks # |