summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-12-10 22:35:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-12-10 22:35:14 (GMT)
commitd67fc4bf0ba89835c61efd1279c732fc640b3b2d (patch)
treeeb26076973292289415d3311e4e3db6f9135c06e /contrib
parentb8148376a2dbb02ade419c2e3fdc478c1f0981dd (diff)
parent7bc341e21b566c6685b7d993ca80459f9994be38 (diff)
downloadgit-d67fc4bf0ba89835c61efd1279c732fc640b3b2d.zip
git-d67fc4bf0ba89835c61efd1279c732fc640b3b2d.tar.gz
git-d67fc4bf0ba89835c61efd1279c732fc640b3b2d.tar.bz2
Merge branch 'bc/require-c99'
Weather balloon to break people with compilers that do not support C99. * bc/require-c99: git-compat-util: add a test balloon for C99 support
Diffstat (limited to 'contrib')
-rw-r--r--contrib/buildsystems/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 86b4611..be67b4d 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -208,7 +208,7 @@ endif()
if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
- add_compile_options(/MP)
+ add_compile_options(/MP /std:c11)
endif()
#default behaviour