From 89ee932db394f65aa5b18bd2c09c8c55e6566abe Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Mon, 29 Dec 2025 22:09:03 -0500 Subject: [PATCH] build: adjust spacing for cmake files --- deploy/CMakeLists.txt | 1 - src/apps/CMakeLists.txt | 8 ++++---- src/lib/client/CMakeLists.txt | 1 - src/lib/common/CMakeLists.txt | 2 +- src/lib/io/CMakeLists.txt | 14 +++++++------- src/lib/platform/CMakeLists.txt | 6 +----- 6 files changed, 13 insertions(+), 19 deletions(-) diff --git a/deploy/CMakeLists.txt b/deploy/CMakeLists.txt index c84e0b5c7..25f48b282 100644 --- a/deploy/CMakeLists.txt +++ b/deploy/CMakeLists.txt @@ -8,7 +8,6 @@ file(COPY_FILE ONLY_IF_DIFFERENT ) - # Generic Package Items set(CPACK_STRIP_FILES TRUE) set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME}) diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt index 2ef28e3fe..14404ec44 100644 --- a/src/apps/CMakeLists.txt +++ b/src/apps/CMakeLists.txt @@ -29,10 +29,10 @@ function(generate_app_man TARGET NAME) endfunction() set(WIN32_PRE_EXCLUDE_REGEXES - "api-ms-win-.*" - "ext-ms-.*" - "^hvsifiletrust\\.dll$" - "^icu.*\\.dll$" + "api-ms-win-.*" + "ext-ms-.*" + "^hvsifiletrust\\.dll$" + "^icu.*\\.dll$" ) set(WIN32_POST_EXCLUDE_REGEXES ".*system32.*") diff --git a/src/lib/client/CMakeLists.txt b/src/lib/client/CMakeLists.txt index f6e0519f1..55a060c2e 100644 --- a/src/lib/client/CMakeLists.txt +++ b/src/lib/client/CMakeLists.txt @@ -3,7 +3,6 @@ # SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton # SPDX-License-Identifier: MIT - add_library(client STATIC Client.cpp Client.h diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt index c3f63e320..4ca144654 100644 --- a/src/lib/common/CMakeLists.txt +++ b/src/lib/common/CMakeLists.txt @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: (C) 2024 - 2025 Chris Rizzitello # SPDX-License-Identifier: MIT - set(CORE_BINARY "${CMAKE_PROJECT_NAME}-core") +set(CORE_BINARY "${CMAKE_PROJECT_NAME}-core") if(WIN32) string(APPEND CORE_BINARY ".exe") endif() diff --git a/src/lib/io/CMakeLists.txt b/src/lib/io/CMakeLists.txt index a46782db1..926eba838 100644 --- a/src/lib/io/CMakeLists.txt +++ b/src/lib/io/CMakeLists.txt @@ -4,13 +4,13 @@ # SPDX-License-Identifier: MIT add_library(io STATIC - IOException.cpp - IOException.h - IStream.h - StreamBuffer.cpp - StreamBuffer.h - StreamFilter.cpp - StreamFilter.h + IOException.cpp + IOException.h + IStream.h + StreamBuffer.cpp + StreamBuffer.h + StreamFilter.cpp + StreamFilter.h ) target_link_libraries(io PUBLIC common) diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt index a71712321..f23b025ae 100644 --- a/src/lib/platform/CMakeLists.txt +++ b/src/lib/platform/CMakeLists.txt @@ -169,8 +169,7 @@ macro(link_wayland_libs) target_link_libraries(platform ${LIBXKBCOMMON_LINK_LIBRARIES} ${GLIB2_LINK_LIBRARIES} ${LIBM_LIBRARIES} - ${LIBEI_LINK_LIBRARIES} ${LIBPORTAL_LINK_LIBRARIES} - ) + ${LIBEI_LINK_LIBRARIES} ${LIBPORTAL_LINK_LIBRARIES}) target_include_directories(platform PUBLIC ${LIBEI_INCLUDE_DIRS} ${LIBPORTAL_INCLUDE_DIRS}) @@ -186,13 +185,10 @@ if(UNIX) ${libs}) if(NOT APPLE) - if(${LIBXKBCOMMON_VERSION} VERSION_GREATER_EQUAL "1.10") target_compile_definitions(platform PRIVATE HAVE_XKB_KEYMAP_MOD_GET_MASK=1) endif() - target_link_libraries(platform Qt6::DBus) - link_wayland_libs() endif() endif()