Skip to content

Commit 0cd2e86

Browse files
ReenigneArcherReenigneArcher
committed
Fix lint errors
1 parent a29c6bd commit 0cd2e86

12 files changed

Lines changed: 674 additions & 630 deletions

‎CMakeLists.txt‎

Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ set(CMAKE_CXX_EXTENSIONS OFF)
1414

1515
set(LIBVIRTUALHID_IS_TOP_LEVEL OFF)
1616
if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
17-
set(LIBVIRTUALHID_IS_TOP_LEVEL ON)
17+
set(LIBVIRTUALHID_IS_TOP_LEVEL ON)
1818
endif()
1919

2020
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
21-
message(STATUS "Setting build type to 'Release' as none was specified.")
22-
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build." FORCE)
21+
message(STATUS "Setting build type to 'Release' as none was specified.")
22+
set(CMAKE_BUILD_TYPE "Release" CACHE STRING
23+
"Choose the type of build." FORCE)
2324
endif()
2425

2526
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
@@ -37,22 +38,26 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
3738
include(CMakePackageConfigHelpers)
3839
include(GNUInstallDirs)
3940

41+
# Copy MinGW runtime DLLs beside a target when using GNU toolchains on Windows.
4042
function(libvirtualhid_copy_mingw_runtime target_name)
41-
if(NOT WIN32 OR NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
42-
return()
43+
if(NOT WIN32 OR NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
44+
return()
45+
endif()
46+
47+
get_filename_component(lvh_compiler_dir "${CMAKE_CXX_COMPILER}" DIRECTORY)
48+
foreach(lvh_runtime_dll IN ITEMS
49+
libgcc_s_seh-1.dll
50+
libstdc++-6.dll
51+
libwinpthread-1.dll)
52+
set(lvh_runtime_path "${lvh_compiler_dir}/${lvh_runtime_dll}")
53+
if(EXISTS "${lvh_runtime_path}")
54+
add_custom_command(TARGET "${target_name}" POST_BUILD
55+
COMMAND ${CMAKE_COMMAND} -E copy_if_different
56+
"${lvh_runtime_path}"
57+
"$<TARGET_FILE_DIR:${target_name}>"
58+
COMMENT "Copying MinGW runtime ${lvh_runtime_dll}")
4359
endif()
44-
45-
get_filename_component(_lvh_compiler_dir "${CMAKE_CXX_COMPILER}" DIRECTORY)
46-
foreach(_lvh_runtime_dll IN ITEMS libgcc_s_seh-1.dll libstdc++-6.dll libwinpthread-1.dll)
47-
set(_lvh_runtime_path "${_lvh_compiler_dir}/${_lvh_runtime_dll}")
48-
if(EXISTS "${_lvh_runtime_path}")
49-
add_custom_command(TARGET "${target_name}" POST_BUILD
50-
COMMAND ${CMAKE_COMMAND} -E copy_if_different
51-
"${_lvh_runtime_path}"
52-
"$<TARGET_FILE_DIR:${target_name}>"
53-
COMMENT "Copying ${_lvh_runtime_dll} to $<TARGET_FILE_DIR:${target_name}>")
54-
endif()
55-
endforeach()
60+
endforeach()
5661
endfunction()
5762

5863
#
@@ -64,36 +69,36 @@ add_subdirectory(src)
6469
# Examples, tests, and docs are top-level only
6570
#
6671
if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
67-
if(BUILD_DOCS)
68-
add_subdirectory(third-party/doxyconfig docs)
69-
endif()
70-
71-
if(BUILD_EXAMPLES)
72-
add_subdirectory(examples)
73-
endif()
74-
75-
if(BUILD_TESTS)
76-
enable_testing()
77-
add_subdirectory(tests)
78-
endif()
72+
if(BUILD_DOCS)
73+
add_subdirectory(third-party/doxyconfig docs)
74+
endif()
75+
76+
if(BUILD_EXAMPLES)
77+
add_subdirectory(examples)
78+
endif()
79+
80+
if(BUILD_TESTS)
81+
enable_testing()
82+
add_subdirectory(tests)
83+
endif()
7984
endif()
8085

8186
#
8287
# Package config
8388
#
8489
configure_package_config_file(
85-
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/libvirtualhid-config.cmake.in"
86-
"${CMAKE_CURRENT_BINARY_DIR}/libvirtualhid-config.cmake"
87-
INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/libvirtualhid"
90+
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/libvirtualhid-config.cmake.in"
91+
"${CMAKE_CURRENT_BINARY_DIR}/libvirtualhid-config.cmake"
92+
INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/libvirtualhid"
8893
)
8994

9095
write_basic_package_version_file(
91-
"${CMAKE_CURRENT_BINARY_DIR}/libvirtualhid-config-version.cmake"
92-
VERSION ${PROJECT_VERSION}
93-
COMPATIBILITY SameMajorVersion
96+
"${CMAKE_CURRENT_BINARY_DIR}/libvirtualhid-config-version.cmake"
97+
VERSION ${PROJECT_VERSION}
98+
COMPATIBILITY SameMajorVersion
9499
)
95100

96101
install(FILES
97102
"${CMAKE_CURRENT_BINARY_DIR}/libvirtualhid-config.cmake"
98103
"${CMAKE_CURRENT_BINARY_DIR}/libvirtualhid-config-version.cmake"
99-
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/libvirtualhid")
104+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/libvirtualhid")

‎examples/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
add_executable(sunshine_gamepad_adapter
2-
"${CMAKE_CURRENT_SOURCE_DIR}/sunshine_gamepad_adapter.cpp")
2+
"${CMAKE_CURRENT_SOURCE_DIR}/sunshine_gamepad_adapter.cpp")
33

44
target_link_libraries(sunshine_gamepad_adapter
5-
PRIVATE
6-
libvirtualhid::libvirtualhid)
5+
PRIVATE
6+
libvirtualhid::libvirtualhid)
77

88
libvirtualhid_copy_mingw_runtime(sunshine_gamepad_adapter)

‎src/CMakeLists.txt‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,37 @@ add_library(${PROJECT_NAME} STATIC)
22
add_library(libvirtualhid::libvirtualhid ALIAS ${PROJECT_NAME})
33

44
target_sources(${PROJECT_NAME}
5-
PRIVATE
6-
"${CMAKE_CURRENT_SOURCE_DIR}/core/profiles.cpp"
7-
"${CMAKE_CURRENT_SOURCE_DIR}/core/report.cpp"
8-
"${CMAKE_CURRENT_SOURCE_DIR}/core/runtime.cpp"
9-
"${CMAKE_CURRENT_SOURCE_DIR}/core/types.cpp")
5+
PRIVATE
6+
"${CMAKE_CURRENT_SOURCE_DIR}/core/profiles.cpp"
7+
"${CMAKE_CURRENT_SOURCE_DIR}/core/report.cpp"
8+
"${CMAKE_CURRENT_SOURCE_DIR}/core/runtime.cpp"
9+
"${CMAKE_CURRENT_SOURCE_DIR}/core/types.cpp")
1010

1111
target_include_directories(${PROJECT_NAME}
12-
PUBLIC
13-
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
14-
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
12+
PUBLIC
13+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
14+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
1515

1616
target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_20)
1717
set_target_properties(${PROJECT_NAME} PROPERTIES
18-
EXPORT_NAME libvirtualhid
19-
OUTPUT_NAME virtualhid)
18+
EXPORT_NAME libvirtualhid
19+
OUTPUT_NAME virtualhid)
2020

2121
if(MSVC)
22-
target_compile_options(${PROJECT_NAME} PRIVATE /W4)
22+
target_compile_options(${PROJECT_NAME} PRIVATE /W4)
2323
else()
24-
target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Wpedantic)
24+
target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Wpedantic)
2525
endif()
2626

2727
install(TARGETS ${PROJECT_NAME}
28-
EXPORT libvirtualhid-targets
29-
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
30-
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
31-
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
28+
EXPORT libvirtualhid-targets
29+
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
30+
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
31+
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
3232

3333
install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/"
34-
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
34+
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
3535

3636
install(EXPORT libvirtualhid-targets
37-
NAMESPACE libvirtualhid::
38-
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/libvirtualhid")
37+
NAMESPACE libvirtualhid::
38+
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/libvirtualhid")

0 commit comments

Comments
 (0)