From 1806f3f367c58e72c48d61f60c563342c8331712 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Thu, 28 Oct 2021 23:14:01 +0200 Subject: [PATCH] Remove KDMacTouchBar module --- .gitmodules | 3 --- CMakeLists.txt | 4 ---- src/CMakeLists.txt | 8 -------- 3 files changed, 15 deletions(-) diff --git a/.gitmodules b/.gitmodules index 74fabd61..5a3ea2dd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "contrib/tor"] path = contrib/tor url = https://git.torproject.org/tor.git -[submodule "contrib/KDMacTouchBar"] - path = contrib/KDMacTouchBar - url = https://github.com/KDAB/KDMacTouchBar.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e803939..0fcf663d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -344,8 +344,4 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}") -if(APPLE) - add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/contrib/KDMacTouchBar") -endif() - add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bb4e6aaa..fdbbd7cd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -264,14 +264,6 @@ if (WITH_SCANNER) ) endif() -if(APPLE) - target_link_libraries(feather - KDMacTouchBar - ) - target_include_directories(feather - PUBLIC ../contrib/KDMacTouchBar) -endif() - if(NOT APPLE) target_link_libraries(feather Qt5::QSvgIconPlugin -- 2.52.0