Skip to content

Commit

Permalink
Fix whitespacing.
Browse files Browse the repository at this point in the history
  • Loading branch information
Malkierian committed Sep 25, 2024
1 parent 9f8e13c commit f4644a9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cmake/dependencies/common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ find_package(OpenGL QUIET)
# When using the Visual Studio generator, it is necessary to suppress stderr output entirely so it does not interrupt the patch command.
# Redirecting to nul is used here instead of the `--quiet` flag, as that flag was only recently introduced in git 2.25.0 (Jan 2022)
if (CMAKE_GENERATOR MATCHES "Visual Studio")
set(git_hide_output 2> nul)
set(git_hide_output 2> nul)
endif()

#=================== ImGui ===================
Expand All @@ -17,7 +17,7 @@ FetchContent_Declare(
ImGui
GIT_REPOSITORY https://github.com/ocornut/imgui.git
GIT_TAG v1.90.6-docking
PATCH_COMMAND ${sdl_apply_patch_if_needed}
PATCH_COMMAND ${sdl_apply_patch_if_needed}
)
FetchContent_MakeAvailable(ImGui)
list(APPEND ADDITIONAL_LIB_INCLUDES ${imgui_SOURCE_DIR} ${imgui_SOURCE_DIR}/backends)
Expand Down Expand Up @@ -45,7 +45,7 @@ target_include_directories(ImGui PUBLIC ${imgui_SOURCE_DIR} ${imgui_SOURCE_DIR}/
# ========= StormLib =============
if(NOT EXCLUDE_MPQ_SUPPORT)
set(stormlib_patch_file ${CMAKE_CURRENT_SOURCE_DIR}/cmake/dependencies/patches/stormlib-optimizations.patch)

# Applies the patch or checks if it has already been applied successfully previously. Will error otherwise.
set(stormlib_apply_patch_if_needed git apply --quiet ${stormlib_patch_file} ${git_hide_output} || git apply --reverse --check ${stormlib_patch_file})

Expand Down

0 comments on commit f4644a9

Please sign in to comment.