Fixed USE_X11 flag behavior

Author: Vitozz

CMakeLists.txt

@@ -199,6 +199,8 @@ if(UNIX AND NOT (APPLE OR HAIKU))
     if(USE_X11)
         add_definitions( -DHAVE_X11 )
         message(STATUS "X11 features support - ENABLED")
+    elseif(NOT LIMIT_X11_USAGE)
+        set(USE_XSS OFF)
     endif()
     if(LIMIT_X11_USAGE)
         add_definitions( -DLIMIT_X11_USAGE )
@@ -228,9 +230,9 @@ endif()
 # Detect NetBSD and handle library path accordingly
 STRING (REGEX MATCH "NetBSD" PROJECT_OS_NETBSD ${CMAKE_SYSTEM_NAME})
 if(PROJECT_OS_NETBSD)
-	message(STATUS "NetBSD detected")
-	set(CMAKE_C_FLAGS "-Wl,-rpath,/usr/X11R7/lib -Wl,-rpath,/usr/pkg/lib -Wl,-rpath,/usr/pkg/qt5/lib")
-	set(CMAKE_CXX_FLAGS "-Wl,-rpath,/usr/X11R7/lib -Wl,-rpath,/usr/pkg/lib -Wl,-rpath,/usr/pkg/qt5/lib")
+    message(STATUS "NetBSD detected")
+    set(CMAKE_C_FLAGS "-Wl,-rpath,/usr/X11R7/lib -Wl,-rpath,/usr/pkg/lib -Wl,-rpath,/usr/pkg/qt5/lib")
+    set(CMAKE_CXX_FLAGS "-Wl,-rpath,/usr/X11R7/lib -Wl,-rpath,/usr/pkg/lib -Wl,-rpath,/usr/pkg/qt5/lib")
 endif()
 
 # Qt dependencies make building very slow

src/CMakeLists.txt

@@ -49,16 +49,19 @@ if(USE_KEYCHAIN)
 endif()
 
 if(LINUX)
-    find_package(Qt5 COMPONENTS X11Extras REQUIRED)
     if(USE_DBUS)
         find_package(Qt5 COMPONENTS DBus REQUIRED)
     endif()
-    find_package(XCB REQUIRED)
-    set(EXTRA_LIBS
-        ${XCB_LIBRARY}
-    )
-    include_directories(${LIBXCB_INCLUDE_DIR})
-    add_definitions(${LIBXCB_DEFINITIONS})
+    if(USE_X11 OR LIMIT_X11_USAGE)
+        find_package(Qt5 COMPONENTS X11Extras REQUIRED)
+        find_package(XCB REQUIRED)
+        set(EXTRA_LIBS
+            ${XCB_LIBRARY}
+        )
+        include_directories(${LIBXCB_INCLUDE_DIR})
+        add_definitions(${LIBXCB_DEFINITIONS})
+        list(APPEND QT_LIBRARIES Qt5::X11Extras ${LIBXCB_LIBRARIES})
+    endif()
 endif()
 
 if(APPLE)
@@ -80,7 +83,6 @@ endif()
 set(QT_LIBRARIES Qt5::Widgets Qt5::Core Qt5::Network Qt5::Xml ${WEBKIT_LIBS} Qt5::Concurrent Qt5::Multimedia Qt5::Svg Qt5::Sql ${KEYCHAIN_LIBS})
 
 if(LINUX)
-    list(APPEND QT_LIBRARIES Qt5::X11Extras ${LIBXCB_LIBRARIES})
     if(USE_DBUS)
         list(APPEND QT_LIBRARIES Qt5::DBus)
     endif()
@@ -109,7 +111,7 @@ else()
     endif()
 endif()
 
-if(LINUX)
+if(LINUX AND (USE_X11 OR LIMIT_X11_USAGE))
     find_package(X11 REQUIRED)
     include_directories(${X11_INCLUDE_DIR})
 endif()