diff --git a/CMakeLists.txt b/CMakeLists.txt index 5315c67845..d04b96aac2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 8ac7f4fe26..9aa5ff1bdc 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -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() diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index 8ac837541d..4ca4a216fb 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -360,8 +360,8 @@ PRIVATE if (WIN32) target_link_libraries(dolphin-emu PRIVATE - gdi32.lib - shell32.lib + gdi32.lib + shell32.lib ) endif() diff --git a/Source/Core/MacUpdater/CMakeLists.txt b/Source/Core/MacUpdater/CMakeLists.txt index 65e7d99a92..dc09866822 100644 --- a/Source/Core/MacUpdater/CMakeLists.txt +++ b/Source/Core/MacUpdater/CMakeLists.txt @@ -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)