Merge pull request #3687 from mstrap/CMAKE_C_FLAGS_DEBUG

CMake: do not overwrite but only append to CMAKE_C_FLAGS_DEBUG
This commit is contained in:
Edward Thomson 2016-03-17 06:54:03 -07:00
commit 31dc0599c5

View File

@ -412,7 +412,7 @@ IF (MSVC)
# /MTd - Statically link the multithreaded debug version of the CRT # /MTd - Statically link the multithreaded debug version of the CRT
# /MDd - Dynamically link the multithreaded debug version of the CRT # /MDd - Dynamically link the multithreaded debug version of the CRT
# /RTC1 - Run time checks # /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 # /DNDEBUG - Disables asserts
# /MT - Statically link the multithreaded release version of the CRT # /MT - Statically link the multithreaded release version of the CRT
@ -464,7 +464,7 @@ ELSE ()
ENDIF() ENDIF()
IF (WIN32 AND NOT CYGWIN) IF (WIN32 AND NOT CYGWIN)
SET(CMAKE_C_FLAGS_DEBUG "-D_DEBUG") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
ENDIF () ENDIF ()
IF (MINGW) # MinGW always does PIC and complains if we tell it to IF (MINGW) # MinGW always does PIC and complains if we tell it to