gnucash maint: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sun Apr 16 19:58:58 EDT 2017
Updated via https://github.com/Gnucash/gnucash/commit/82c93675 (commit)
via https://github.com/Gnucash/gnucash/commit/81fa7d76 (commit)
from https://github.com/Gnucash/gnucash/commit/aa6854fb (commit)
commit 82c9367503a8ca5d630182c7b3c808b3fce707b1
Merge: aa6854f 81fa7d7
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 16 16:59:35 2017 -0700
Merge branch 'PR140' into maint
commit 81fa7d76c43763643926f8cdff0a3eb1c5b8f981
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Aug 4 14:41:18 2016 -0700
Adjust CMAKE_C_FLAGS for better release/debug behavior.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 229ab63..5dd52db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -416,8 +416,9 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") # FIXME: should be -std=
IF (UNIX)
- SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wdeclaration-after-statement -Wno-pointer-sign -D_FORTIFY_SOURCE=2 -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wno-unused -std=gnu99")
- SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=deprecated-declarations")
+ SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wno-unused")
+ SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=deprecated-declarations -std=gnu99")
+ SET( CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2")
ENDIF (UNIX)
IF (MINGW)
SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wno-unused -std=gnu99")
@@ -425,6 +426,8 @@ ENDIF (MINGW)
IF (APPLE)
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedef")
ENDIF(APPLE)
+SET( CMAKE_C_FLAGS_DEBUG "-O0 -g ${CMAKE_C_FLAGS}")
+SET( CMAKE_CXX_FLAGS_DEBUG "-O0 -g ${CMAKE_CXX_FLAGS}")
IF (APPLE AND WITH_GNUCASH)
SET(CMAKE_MACOSX_RPATH ON)
Summary of changes:
CMakeLists.txt | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
More information about the gnucash-changes
mailing list