Always build Wayland support

Signed-off-by: Jean Hertel <[email protected]>
jlHertel · Jan 27, 2020 · 4aea0ba · 4aea0ba
1 parent 3c170ed
commit 4aea0ba
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 104 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,6 @@ project(adriconf)
 
 set(CMAKE_CXX_STANDARD 14)
 
-option(ENABLE_XWAYLAND "Enable XWayland support" ON)
 option(ENABLE_UNIT_TESTS "Enables building Unit tests" ON)
 set(TOP_CMAKE_WAS_CALLED TRUE)
 
@@ -102,8 +101,6 @@ set(SHARED_SOURCE_FILES
         ${CMAKE_SOURCE_DIR}/adriconf/Utils/ConfigurationResolverInterface.h
         ${CMAKE_SOURCE_DIR}/adriconf/Utils/DRIQuery.cpp
         ${CMAKE_SOURCE_DIR}/adriconf/Utils/DRIQuery.h
-        ${CMAKE_SOURCE_DIR}/adriconf/Utils/HelpersWayland.cpp
-        ${CMAKE_SOURCE_DIR}/adriconf/Utils/HelpersWayland.h
         ${CMAKE_SOURCE_DIR}/adriconf/Utils/WriterInterface.h
         ${CMAKE_SOURCE_DIR}/adriconf/Utils/ConfigurationLoaderInterface.h
         ${CMAKE_SOURCE_DIR}/adriconf/Utils/PCIDatabaseQuery.cpp

diff --git a/adriconf/CMakeLists.txt b/adriconf/CMakeLists.txt
@@ -47,10 +47,6 @@ endif ()
 target_link_libraries(adriconf ${EGL_LIBRARIES})
 target_include_directories(adriconf PUBLIC ${EGL_INCLUDE_DIRS})
 
-if (ENABLE_XWAYLAND)
-    target_compile_definitions(adriconf PRIVATE ENABLE_XWAYLAND)
-endif ()
-
 target_compile_options(adriconf PRIVATE -Wall -Wextra -pedantic)
 
 add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/adriconf/resources.c

diff --git a/adriconf/Utils/DRIQuery.h b/adriconf/Utils/DRIQuery.h
@@ -4,7 +4,6 @@
 #include "../ValueObject/DriverConfiguration.h"
 #include "Parser.h"
 #include "../ValueObject/GPUInfo.h"
-#include "HelpersWayland.h"
 #include "../Logging/LoggerInterface.h"
 #include "PCIDatabaseQueryInterface.h"
 #include "GBMDeviceFactoryInterface.h"

diff --git a/adriconf/Utils/HelpersWayland.cpp b/adriconf/Utils/HelpersWayland.cpp
diff --git a/adriconf/Utils/HelpersWayland.h b/adriconf/Utils/HelpersWayland.h
diff --git a/flatpak/br.com.jeanhertel.adriconf.json b/flatpak/br.com.jeanhertel.adriconf.json
@@ -178,7 +178,7 @@
       {
          "name": "adriconf",
          "buildsystem": "cmake-ninja",
-         "config-opts": ["-DENABLE_XWAYLAND=1", "-DENABLE_UNIT_TESTS=0"],
+         "config-opts": ["-DENABLE_UNIT_TESTS=0"],
          "sources": [
             {
                "type": "git",

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -56,8 +56,4 @@ endif ()
 target_link_libraries(runUnitTests ${EGL_LIBRARIES})
 target_include_directories(runUnitTests PUBLIC ${EGL_INCLUDE_DIRS})
 
-if (ENABLE_XWAYLAND)
-    target_compile_definitions(runUnitTests PRIVATE ENABLE_XWAYLAND)
-endif ()
-
 target_compile_options(runUnitTests PRIVATE -Wall -Wextra -pedantic)