Merge pull request #10373 from Pokechu22/cmake-tab

CMakeLists: Replace tab characters with spaces
This commit is contained in:
Léo Lam 2022-01-17 00:47:29 +01:00 committed by GitHub
commit e627718560
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions

View File

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

View File

@ -30,12 +30,12 @@ set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
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.
foreach(flag_var
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
MAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
# Replaces /W3 with /W4 in defaults (add_compile_options would cause very annoying warnings here)
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
MAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
# Replaces /W3 with /W4 in defaults (add_compile_options would cause very annoying warnings here)
string(REPLACE "/W3" "/W4" ${flag_var} "${${flag_var}}")
endforeach()

View File

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

View File

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