build: adjust spacing for cmake files
This commit is contained in:
parent
fb63b70e8d
commit
89ee932db3
6 changed files with 13 additions and 19 deletions
|
|
@ -8,7 +8,6 @@ file(COPY_FILE
|
||||||
ONLY_IF_DIFFERENT
|
ONLY_IF_DIFFERENT
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
# Generic Package Items
|
# Generic Package Items
|
||||||
set(CPACK_STRIP_FILES TRUE)
|
set(CPACK_STRIP_FILES TRUE)
|
||||||
set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
|
set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
|
||||||
|
|
|
||||||
|
|
@ -29,10 +29,10 @@ function(generate_app_man TARGET NAME)
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
set(WIN32_PRE_EXCLUDE_REGEXES
|
set(WIN32_PRE_EXCLUDE_REGEXES
|
||||||
"api-ms-win-.*"
|
"api-ms-win-.*"
|
||||||
"ext-ms-.*"
|
"ext-ms-.*"
|
||||||
"^hvsifiletrust\\.dll$"
|
"^hvsifiletrust\\.dll$"
|
||||||
"^icu.*\\.dll$"
|
"^icu.*\\.dll$"
|
||||||
)
|
)
|
||||||
|
|
||||||
set(WIN32_POST_EXCLUDE_REGEXES ".*system32.*")
|
set(WIN32_POST_EXCLUDE_REGEXES ".*system32.*")
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
|
# SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton
|
||||||
# SPDX-License-Identifier: MIT
|
# SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
|
||||||
add_library(client STATIC
|
add_library(client STATIC
|
||||||
Client.cpp
|
Client.cpp
|
||||||
Client.h
|
Client.h
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# SPDX-FileCopyrightText: (C) 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
|
# SPDX-FileCopyrightText: (C) 2024 - 2025 Chris Rizzitello <sithlord48@gmail.com>
|
||||||
# SPDX-License-Identifier: MIT
|
# SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
set(CORE_BINARY "${CMAKE_PROJECT_NAME}-core")
|
set(CORE_BINARY "${CMAKE_PROJECT_NAME}-core")
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
string(APPEND CORE_BINARY ".exe")
|
string(APPEND CORE_BINARY ".exe")
|
||||||
endif()
|
endif()
|
||||||
|
|
|
||||||
|
|
@ -4,13 +4,13 @@
|
||||||
# SPDX-License-Identifier: MIT
|
# SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
add_library(io STATIC
|
add_library(io STATIC
|
||||||
IOException.cpp
|
IOException.cpp
|
||||||
IOException.h
|
IOException.h
|
||||||
IStream.h
|
IStream.h
|
||||||
StreamBuffer.cpp
|
StreamBuffer.cpp
|
||||||
StreamBuffer.h
|
StreamBuffer.h
|
||||||
StreamFilter.cpp
|
StreamFilter.cpp
|
||||||
StreamFilter.h
|
StreamFilter.h
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(io PUBLIC common)
|
target_link_libraries(io PUBLIC common)
|
||||||
|
|
|
||||||
|
|
@ -169,8 +169,7 @@ macro(link_wayland_libs)
|
||||||
|
|
||||||
target_link_libraries(platform ${LIBXKBCOMMON_LINK_LIBRARIES}
|
target_link_libraries(platform ${LIBXKBCOMMON_LINK_LIBRARIES}
|
||||||
${GLIB2_LINK_LIBRARIES} ${LIBM_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})
|
target_include_directories(platform PUBLIC ${LIBEI_INCLUDE_DIRS} ${LIBPORTAL_INCLUDE_DIRS})
|
||||||
|
|
||||||
|
|
@ -186,13 +185,10 @@ if(UNIX)
|
||||||
${libs})
|
${libs})
|
||||||
|
|
||||||
if(NOT APPLE)
|
if(NOT APPLE)
|
||||||
|
|
||||||
if(${LIBXKBCOMMON_VERSION} VERSION_GREATER_EQUAL "1.10")
|
if(${LIBXKBCOMMON_VERSION} VERSION_GREATER_EQUAL "1.10")
|
||||||
target_compile_definitions(platform PRIVATE HAVE_XKB_KEYMAP_MOD_GET_MASK=1)
|
target_compile_definitions(platform PRIVATE HAVE_XKB_KEYMAP_MOD_GET_MASK=1)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_link_libraries(platform Qt6::DBus)
|
target_link_libraries(platform Qt6::DBus)
|
||||||
|
|
||||||
link_wayland_libs()
|
link_wayland_libs()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue