Firehawk52-backup/dolphin
28
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-01-15 16:33:15 -03:00
Code Issues Actions Packages Projects Releases Wiki Activity

CMake: Apply editorconfig formatting

Browse Source
This commit is contained in:
Joshua Vandaële
2026-01-04 12:53:05 +01:00
parent 75560925f1
commit 7f6bf67182
37 changed files with 708 additions and 708 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CMakeLists.txt
View File

@@ -76,7 +76,7 @@ add_definitions(-D__STDC_CONSTANT_MACROS)
check_symbol_exists(elf_aux_info sys/auxv.h HAVE_ELF_AUX_INFO)
if(HAVE_ELF_AUX_INFO)
add_definitions(-DHAVE_ELF_AUX_INFO)
add_definitions(-DHAVE_ELF_AUX_INFO)
endif()
add_subdirectory(Core)

4
Source/Core/DolphinQt/CMakeLists.txt
View File

@@ -377,8 +377,8 @@ add_executable(dolphin-emu
Settings/GeneralPane.h
Settings/InterfacePane.cpp
Settings/InterfacePane.h
Settings/OnScreenDisplayPane.cpp
Settings/OnScreenDisplayPane.h
Settings/OnScreenDisplayPane.cpp
Settings/OnScreenDisplayPane.h
Settings/PathPane.cpp
Settings/PathPane.h
Settings/USBDevicePicker.cpp

12
Source/Core/MacUpdater/CMakeLists.txt
View File

@@ -24,12 +24,12 @@ target_sources(MacUpdater PRIVATE "${CMAKE_SOURCE_DIR}/Data/Dolphin.icns")
set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/Dolphin.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
target_link_libraries(MacUpdater PRIVATE
"-framework Cocoa"
"-framework AppKit"
"-framework CoreData"
"-framework Foundation"
uicommon
updatercommon
"-framework Cocoa"
"-framework AppKit"
"-framework CoreData"
"-framework Foundation"
uicommon
updatercommon
)
# Compile storyboards (Adapted from https://gitlab.kitware.com/cmake/community/wikis/doc/tutorials/OSX-InterfaceBuilderFiles)

30
Source/PCH/CMakeLists.txt
View File

@@ -23,37 +23,37 @@ target_compile_options(build_pch PUBLIC /Fp$<TARGET_FILE_DIR:build_pch>/dolphin.
# Sharing a PCH breaks pdb files. So we use the /Z7 option to inline the pdb into
# the binary. However MSVC gets noisy if you set both /Zi and /Z7
if (POLICY CMP0141)
# CMake 3.25 has a policy that makes us control this somewhat sanely
set_property(TARGET build_pch PROPERTY MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>")
# CMake 3.25 has a policy that makes us control this somewhat sanely
set_property(TARGET build_pch PROPERTY MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>")
# Unfortnually, properties don't propagate. So we also set it globally via parent scope
set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>" PARENT_SCOPE)
# Unfortnually, properties don't propagate. So we also set it globally via parent scope
set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>" PARENT_SCOPE)
else()
if (CMAKE_CXX_FLAGS_DEBUG MATCHES "/Zi")
# Otherwise we do an ugly string replace to remove it from FLAGS_DEBUG
string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
if (CMAKE_CXX_FLAGS_DEBUG MATCHES "/Zi")
# Otherwise we do an ugly string replace to remove it from FLAGS_DEBUG
string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
# and also overwrite the version in the parent scope
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" PARENT_SCOPE)
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}" PARENT_SCOPE)
# and also overwrite the version in the parent scope
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" PARENT_SCOPE)
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}" PARENT_SCOPE)
target_compile_options(build_pch PUBLIC "$<$<CONFIG:Debug,RelWithDebInfo>:/Z7>")
endif()
target_compile_options(build_pch PUBLIC "$<$<CONFIG:Debug,RelWithDebInfo>:/Z7>")
endif()
endif()
# Setting /Z7 also requires us to disable minimal rebuilds.
target_compile_options(build_pch PUBLIC "$<$<CONFIG:Debug,RelWithDebInfo>:/Gm->")
# To get this working with ninja, we need to tell it that compiling pch.cpp generates an extra output
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/pch.cpp PROPERTIES
OBJECT_OUTPUTS $<TARGET_FILE_DIR:build_pch>/dolphin.pch
OBJECT_OUTPUTS $<TARGET_FILE_DIR:build_pch>/dolphin.pch
)
# and then create a custom target that depends on the pch output
# so that ninja won't start building anything that depends on this
# target before the pch is built
add_custom_target(force_build_pch
DEPENDS $<TARGET_FILE_DIR:build_pch>/dolphin.pch
DEPENDS $<TARGET_FILE_DIR:build_pch>/dolphin.pch
)
# link the pch into anything that depends on use_pch