diff --git a/src/cpp-utils/CMakeLists.txt b/src/cpp-utils/CMakeLists.txt
index a3967a4c..b0ce5040 100644
--- a/src/cpp-utils/CMakeLists.txt
+++ b/src/cpp-utils/CMakeLists.txt
@@ -56,12 +56,12 @@ find_package(CURL REQUIRED)
 target_include_directories(${PROJECT_NAME} PUBLIC ${CURL_INCLUDE_DIRS})
 target_link_libraries(${PROJECT_NAME} PUBLIC ${CURL_LIBRARIES})
 
-if(WIN32)
-  target_link_libraries(${PROJECT_NAME} PUBLIC DbgHelp)
-else()
+if(NOT WIN32)
   find_package(Backtrace REQUIRED)
   target_include_directories(${PROJECT_NAME} PUBLIC ${Backtrace_INCLUDE_DIRS})
   target_link_libraries(${PROJECT_NAME} PUBLIC ${Backtrace_LIBRARIES})
+else()
+  target_link_libraries(${PROJECT_NAME} PUBLIC DbgHelp)
 endif()
 
 find_package(Threads REQUIRED)
diff --git a/src/gitversion/gitversion.cmake b/src/gitversion/gitversion.cmake
index 59c088e4..c11352c0 100644
--- a/src/gitversion/gitversion.cmake
+++ b/src/gitversion/gitversion.cmake
@@ -2,7 +2,7 @@ set(DIR_OF_GITVERSION_TOOL "${CMAKE_CURRENT_LIST_DIR}" CACHE INTERNAL "DIR_OF_GI
 
 function (get_git_version OUTPUT_VARIABLE)
     EXECUTE_PROCESS(COMMAND python ${DIR_OF_GITVERSION_TOOL}/getversion.py
-		WORKING_DIRECTORY ${DIR_OF_GITVERSION_TOOL}
+	WORKING_DIRECTORY ${DIR_OF_GITVERSION_TOOL}
         OUTPUT_VARIABLE VERSION
         ERROR_VARIABLE error
         RESULT_VARIABLE result)
diff --git a/vendor/googletest/CMakeLists.txt b/vendor/googletest/CMakeLists.txt
index 00daea9c..2b4b5d24 100644
--- a/vendor/googletest/CMakeLists.txt
+++ b/vendor/googletest/CMakeLists.txt
@@ -1,6 +1,10 @@
 include(CTest)
 
 if (BUILD_TESTING)
+  # Fix how gtest links the C library on windows, see https://github.com/google/googletest/blob/4e4df226fc197c0dda6e37f5c8c3845ca1e73a49/googletest/README.md
+  set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+  set(INSTALL_GTEST off CACHE BOOL "" FORCE)
+  set(INSTALL_GMOCK off CACHE BOOL "" FORCE)
   add_subdirectory(gtest EXCLUDE_FROM_ALL)
 
   project (googletest)
@@ -10,5 +14,7 @@ if (BUILD_TESTING)
   target_include_directories(${PROJECT_NAME} SYSTEM INTERFACE ${gtest_INCLUDE_DIRS}/include SYSTEM ${gmock_INCLUDE_DIRS}/include)
 
   # Disable "missing override" warning because gmock MOCK_METHOD() don't use override :(
-  target_compile_options(${PROJECT_NAME} PUBLIC "-Wno-inconsistent-missing-override")
-endif (BUILD_TESTING)
+  if (NOT WIN32)
+    target_compile_options(${PROJECT_NAME} PUBLIC "-Wno-inconsistent-missing-override")
+  endif()
+endif()