diff options
| -rw-r--r-- | CMakeLists.txt | 55 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 59 |
2 files changed, 59 insertions, 55 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bbca47f26c1..509de9943e2 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 # diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index e09287f05d9..2f9f39b46d9 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -486,6 +486,65 @@ endif() # lfs on glibc, all compilers should use add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE) +# ---------------------------------------------------------------------------- +# System Libraries +# +# Keep last, so indirectly linked libraries don't override our own pre-compiled libs. + +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() + +# ---------------------------------------------------------------------------- +# Compilers + # GNU Compiler if(CMAKE_COMPILER_IS_GNUCC) set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing") |