piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

CMakeLists: Replace tab characters with spaces

Browse Source 
This commit only touches CMakeLists in Source and the main one; it doesn't touch them in Externals.
This commit is contained in:
Pokechu22 2022-01-16 15:20:40 -08:00
parent b7ac11080e
commit ad9e8d97a9
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -678,7 +678,7 @@ endif()
pkg_check_modules(MINIZIP minizip>=2.0.0) pkg_check_modules(MINIZIP minizip>=2.0.0)
if(MINIZIP_FOUND) if(MINIZIP_FOUND)
message(STATUS "Using shared minizip") message(STATUS "Using shared minizip")
include_directories(${MINIZIP_INCLUDE_DIRS}) include_directories(${MINIZIP_INCLUDE_DIRS})
else() else()
check_vendoring_approved(minizip) check_vendoring_approved(minizip)
message(STATUS "Shared minizip not found, falling back to the static library") message(STATUS "Shared minizip not found, falling back to the static library")

8
Source/CMakeLists.txt
View File

@ -30,12 +30,12 @@ set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
if (MSVC) if (MSVC)
# TODO: Use https://cmake.org/cmake/help/latest/policy/CMP0092.html instead (once we can require CMake >= 3.15) # TODO: Use https://cmake.org/cmake/help/latest/policy/CMP0092.html instead (once we can require CMake >= 3.15)
# Taken from http://www.cmake.org/Wiki/CMake_FAQ#Dynamic_Replace. # Taken from http://www.cmake.org/Wiki/CMake_FAQ#Dynamic_Replace.
foreach(flag_var foreach(flag_var
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
MAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) MAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
# Replaces /W3 with /W4 in defaults (add_compile_options would cause very annoying warnings here) # Replaces /W3 with /W4 in defaults (add_compile_options would cause very annoying warnings here)
string(REPLACE "/W3" "/W4" ${flag_var} "${${flag_var}}") string(REPLACE "/W3" "/W4" ${flag_var} "${${flag_var}}")
endforeach() endforeach()

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

@ -360,8 +360,8 @@ PRIVATE
if (WIN32) if (WIN32)
target_link_libraries(dolphin-emu target_link_libraries(dolphin-emu
PRIVATE PRIVATE
gdi32.lib gdi32.lib
shell32.lib shell32.lib
) )
endif() endif()

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

@ -32,8 +32,8 @@ target_link_libraries(MacUpdater PRIVATE
"-framework AppKit" "-framework AppKit"
"-framework CoreData" "-framework CoreData"
"-framework Foundation" "-framework Foundation"
uicommon uicommon
updatercommon updatercommon
) )
# Compile storyboards (Adapted from https://gitlab.kitware.com/cmake/community/wikis/doc/tutorials/OSX-InterfaceBuilderFiles) # Compile storyboards (Adapted from https://gitlab.kitware.com/cmake/community/wikis/doc/tutorials/OSX-InterfaceBuilderFiles)