summaryrefslogtreecommitdiff
path: root/cmake/modules
diff options
context:
space:
mode:
authorSenko Rasic <senko.rasic@dobarkod.hr>2010-11-02 17:20:04 +0100
committerSenko Rasic <senko.rasic@dobarkod.hr>2010-11-02 17:20:04 +0100
commit9d57aecc2092a5ecc8a2d4350f5090b9c70eeb5d (patch)
treeb789f66b8923dc32e33509112885cb647bac59aa /cmake/modules
parentb55f7657bf1ab518bb41e9f3d9f04748e8e6f67f (diff)
append to instead of overwriting supplied CMAKE_CXX_FLAGS/CMAKE_C_FLAGS
Diffstat (limited to 'cmake/modules')
-rw-r--r--cmake/modules/TelepathyDefaults.cmake6
1 files changed, 4 insertions, 2 deletions
diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake
index 926fdaa9..c010ae79 100644
--- a/cmake/modules/TelepathyDefaults.cmake
+++ b/cmake/modules/TelepathyDefaults.cmake
@@ -66,7 +66,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(undesired
missing-field-initializers
unused-parameter)
- compiler_warnings(CMAKE_CXX_FLAGS cxx ${NOT_RELEASE} "${desired}" "${undesired}")
+ compiler_warnings(CMAKE_CXX_FLAGS_WARNINGS cxx ${NOT_RELEASE} "${desired}" "${undesired}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_WARNINGS}")
set(desired_c
all
@@ -83,7 +84,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(undesired_c
missing-field-initializers
unused-parameter)
- compiler_warnings(CMAKE_C_FLAGS c ${NOT_RELEASE} "${desired_c}" "${undesired_c}")
+ compiler_warnings(CMAKE_C_FLAGS_WARNINGS c ${NOT_RELEASE} "${desired_c}" "${undesired_c}")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_WARNINGS}")
if(CMAKE_SYSTEM_NAME MATCHES Linux)
add_definitions(-D_BSD_SOURCE)