diff options
| author | Edward Thomson <ethomson@github.com> | 2016-03-17 06:54:03 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-03-17 06:54:03 -0700 |
| commit | 31dc0599c51f45dc31e3f7bac75387668361d2ff (patch) | |
| tree | 27db75bb6dd0646c30e49e8e3475b9c87cc98616 | |
| parent | 62e237e0314a8677bf2c39f4bdfd1a611e932c1b (diff) | |
| parent | 08f030ced70e0f5d4b8c3f6421899b25c74b2329 (diff) | |
| download | libgit2-31dc0599c51f45dc31e3f7bac75387668361d2ff.tar.gz | |
Merge pull request #3687 from mstrap/CMAKE_C_FLAGS_DEBUG
CMake: do not overwrite but only append to CMAKE_C_FLAGS_DEBUG
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1801c938d..2cfa907f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -412,7 +412,7 @@ IF (MSVC) # /MTd - Statically link the multithreaded debug version of the CRT # /MDd - Dynamically link the multithreaded debug version of the CRT # /RTC1 - Run time checks - SET(CMAKE_C_FLAGS_DEBUG "/Zi /Od /D_DEBUG /RTC1 ${CRT_FLAG_DEBUG}") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Zi /Od /D_DEBUG /RTC1 ${CRT_FLAG_DEBUG}") # /DNDEBUG - Disables asserts # /MT - Statically link the multithreaded release version of the CRT @@ -464,7 +464,7 @@ ELSE () ENDIF() IF (WIN32 AND NOT CYGWIN) - SET(CMAKE_C_FLAGS_DEBUG "-D_DEBUG") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG") ENDIF () IF (MINGW) # MinGW always does PIC and complains if we tell it to |