From e7eb6930c6b8abe76eca19bfcbdb6a3c887bc5f0 Mon Sep 17 00:00:00 2001 From: Christian Parpart Date: Mon, 16 Oct 2023 17:55:56 +0200 Subject: [PATCH] CMake: drop unused options --- src/contour/CMakeLists.txt | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/contour/CMakeLists.txt b/src/contour/CMakeLists.txt index 22ecd930ee..dad504b20b 100644 --- a/src/contour/CMakeLists.txt +++ b/src/contour/CMakeLists.txt @@ -9,8 +9,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") endif() option(CONTOUR_PERF_STATS "Enables debug printing some performance stats." OFF) -option(CONTOUR_VT_METRICS "Enables collecting and exit-printing some VT usage metrics." OFF) -option(CONTOUR_SCROLLBAR "Enables scrollbar in GUI frontend." ON) # Widgets is rquired for SystemTrayIcon's fallback implementation set(QT_COMPONENTS Core Gui Qml Quick QuickControls2 Network Multimedia Widgets) @@ -120,18 +118,10 @@ if(CONTOUR_PERF_STATS) target_compile_definitions(contour PRIVATE CONTOUR_PERF_STATS) endif() -if(CONTOUR_VT_METRICS) - target_compile_definitions(contour PRIVATE CONTOUR_VT_METRICS) -endif() - if(CONTOUR_FRONTEND_GUI) target_compile_definitions(contour PRIVATE CONTOUR_FRONTEND_GUI) endif() -if(CONTOUR_SCROLLBAR) - target_compile_definitions(contour PRIVATE CONTOUR_SCROLLBAR) -endif() - if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") target_compile_definitions(contour PRIVATE CONTOUR_GUI_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}") endif() @@ -196,7 +186,7 @@ if(CONTOUR_FRONTEND_GUI) crispy::core vtrasterizer ) - if(NOT(WIN32) AND NOT(APPLE) AND NOT(CONTOUR_QT_VERSION EQUAL "6")) + if(NOT(WIN32) AND NOT(APPLE)) target_link_libraries(contour Qt5::X11Extras xcb) endif() endif()