Skip to content

Commit 3b91ca5

Browse files
committed
Use more canonical syntax in the CMake build.
* CMakeLists.txt: Use string(APPEND) to extend flags instead of set(). git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1926867 13f79535-47bb-0310-9956-ffa450edef68
1 parent 6ae520c commit 3b91ca5

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

CMakeLists.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -350,33 +350,33 @@ add_compile_definitions("OPENSSL_NO_STDIO")
350350
# Set common compiler flags
351351
if(NOT MSVC)
352352
if(CC_LIKE_GNUC)
353-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
354-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wdeclaration-after-statement")
355-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes")
356-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c89")
353+
string(APPEND CMAKE_C_FLAGS " -Wall")
354+
string(APPEND CMAKE_C_FLAGS " -Wdeclaration-after-statement")
355+
string(APPEND CMAKE_C_FLAGS " -Wmissing-prototypes")
356+
string(APPEND CMAKE_C_FLAGS " -std=c89")
357357

358-
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
358+
string(APPEND CMAKE_C_FLAGS_DEBUG " -O0")
359359

360360
if(SERF_MAINTAINER_MODE)
361361
# Additional warning flags for more pedantic checks
362-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wimplicit-function-declaration")
363-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-variable-declarations")
364-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunreachable-code")
365-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshorten-64-to-32")
366-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-system-headers")
367-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra-tokens")
368-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wnewline-eof")
362+
string(APPEND CMAKE_C_FLAGS " -Wimplicit-function-declaration")
363+
string(APPEND CMAKE_C_FLAGS " -Wmissing-variable-declarations")
364+
string(APPEND CMAKE_C_FLAGS " -Wunreachable-code")
365+
string(APPEND CMAKE_C_FLAGS " -Wshorten-64-to-32")
366+
string(APPEND CMAKE_C_FLAGS " -Wno-system-headers")
367+
string(APPEND CMAKE_C_FLAGS " -Wextra-tokens")
368+
string(APPEND CMAKE_C_FLAGS " -Wnewline-eof")
369369
endif()
370370
endif()
371371
else()
372372
# Warning level 4, no unused argument warnings
373-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4 /wd4100")
373+
string(APPEND CMAKE_C_FLAGS " /W4 /wd4100")
374374
# Conditional expression is constant
375-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4127")
375+
string(APPEND CMAKE_C_FLAGS " /wd4127")
376376
# Assignment within conditional expression
377-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4706")
377+
string(APPEND CMAKE_C_FLAGS " /wd4706")
378378
# 'function' undefined; assuming extern returning int
379-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /we4013")
379+
string(APPEND CMAKE_C_FLAGS " /we4013")
380380

381381
add_compile_definitions(
382382
"WIN32" "WIN32_LEAN_AND_MEAN"

0 commit comments

Comments
 (0)