diff options
| author | Vicent Martà <vicent@github.com> | 2012-10-25 13:17:08 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2012-10-25 13:17:08 -0700 |
| commit | 8bba3c95b8a7eb01d9ee9d68cd3bf0cc38fbd867 (patch) | |
| tree | 46fd3ca3bfeb8affcbb5ae301995d208d75d6549 | |
| parent | 1b9346897b3be1c8f659e12a6ee84c74858fc32e (diff) | |
| parent | 94155e2fa25c2972032431a4260d919354dda19b (diff) | |
| download | libgit2-8bba3c95b8a7eb01d9ee9d68cd3bf0cc38fbd867.tar.gz | |
Merge pull request #1021 from ethomson/cmake_vs
remove /ZM1000 from msvc builds
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a57394640..5111213bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,6 +85,8 @@ IF (MSVC) # Default to stdcall, as that's what the CLR expects and how the Windows API is built OPTION (STDCALL "Buildl libgit2 with the __stdcall convention" ON) + STRING(REPLACE "/Zm1000" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") + SET(CMAKE_C_FLAGS "/W4 /MP /nologo /Zi ${CMAKE_C_FLAGS}") IF (STDCALL) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Gz") @@ -94,6 +96,7 @@ IF (MSVC) SET(WIN_RC "src/win32/git2.rc") # Precompiled headers + ELSE () SET(CMAKE_C_FLAGS_DEBUG "-O0 -g ${CMAKE_C_FLAGS}") SET(CMAKE_C_FLAGS "-O2 -g -D_GNU_SOURCE -Wall -Wextra -Wno-missing-field-initializers -Wstrict-aliasing=2 -Wstrict-prototypes -Wmissing-prototypes ${CMAKE_C_FLAGS}") |
