summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorJoshua Vandaƫle <joshua@vandaele.software>2026-01-04 12:53:05 +0100
committerJoshua Vandaƫle <joshua@vandaele.software>2026-01-04 12:59:56 +0100
commit7f6bf67182adc58ab8a2ced52e3bfcb9952f91eb (patch)
tree08f1972a52b5da7a38f93a4cef3dc060a17208aa /Source
parent75560925f186568d2a0e5f10dcae9acfa8b18688 (diff)
CMake: Apply editorconfig formatting
Diffstat (limited to 'Source')
-rw-r--r--Source/CMakeLists.txt2
-rw-r--r--Source/Core/DolphinQt/CMakeLists.txt4
-rw-r--r--Source/Core/MacUpdater/CMakeLists.txt12
-rw-r--r--Source/PCH/CMakeLists.txt30
4 files changed, 24 insertions, 24 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 8d74b60470..394f8c2484 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -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)
diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt
index cd49f7f108..c6c201ea48 100644
--- a/Source/Core/DolphinQt/CMakeLists.txt
+++ b/Source/Core/DolphinQt/CMakeLists.txt
@@ -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
diff --git a/Source/Core/MacUpdater/CMakeLists.txt b/Source/Core/MacUpdater/CMakeLists.txt
index da6d052fa5..df46f90a86 100644
--- a/Source/Core/MacUpdater/CMakeLists.txt
+++ b/Source/Core/MacUpdater/CMakeLists.txt
@@ -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)
diff --git a/Source/PCH/CMakeLists.txt b/Source/PCH/CMakeLists.txt
index 50f3fa234b..7e515e33df 100644
--- a/Source/PCH/CMakeLists.txt
+++ b/Source/PCH/CMakeLists.txt
@@ -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