Author: brane
Date: Mon Jun 30 22:46:16 2025
New Revision: 1926876
URL: http://svn.apache.org/viewvc?rev=1926876&view=rev
Log:
In the CMake build, use canonical cmakeism to set the C language standard.
* CMakeLists.txt
(CMAKE_C_STANDARD): Set to 90 (that would be ISO/IEC 9899:1990)
(CMAKE_C_STANDARD_REQUIRED): Set to true. We don't support K&R C.
* test/MockHTTPinC/CMakeLists.txt
(CMAKE_C_STANDARD): Override to C99 for MockHTTPinC.
Modified:
serf/trunk/CMakeLists.txt
serf/trunk/test/MockHTTPinC/CMakeLists.txt
Modified: serf/trunk/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/serf/trunk/CMakeLists.txt?rev=1926876&r1=1926875&r2=1926876&view=diff
==============================================================================
--- serf/trunk/CMakeLists.txt (original)
+++ serf/trunk/CMakeLists.txt Mon Jun 30 22:46:16 2025
@@ -351,12 +351,14 @@ if(ENABLE_SLOW_TESTS)
endif()
# Set common compiler flags
+set(CMAKE_C_STANDARD 90) # Use C90. MockHTTP overrides this.
+set(CMAKE_C_STANDARD_REQUIRED TRUE)
+
if(NOT MSVC)
if(CC_LIKE_GNUC)
string(APPEND CMAKE_C_FLAGS " -Wall")
string(APPEND CMAKE_C_FLAGS " -Wdeclaration-after-statement")
string(APPEND CMAKE_C_FLAGS " -Wmissing-prototypes")
- string(APPEND CMAKE_C_FLAGS " -std=c89")
string(APPEND CMAKE_C_FLAGS_DEBUG " -O0")
Modified: serf/trunk/test/MockHTTPinC/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/serf/trunk/test/MockHTTPinC/CMakeLists.txt?rev=1926876&r1=1926875&r2=1926876&view=diff
==============================================================================
--- serf/trunk/test/MockHTTPinC/CMakeLists.txt (original)
+++ serf/trunk/test/MockHTTPinC/CMakeLists.txt Mon Jun 30 22:46:16 2025
@@ -22,10 +22,12 @@ set(MockHTTPinC_SOURCES
"MockHTTP_server.c"
)
+# MockHTTP requires the C99 standard.
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD_REQUIRED TRUE)
+
# Update compiler options for this library.
if(CC_LIKE_GNUC)
- # MockHTTP requires the C99 standard.
- string(REPLACE "-std=c89" "-std=c99" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
# Also silence all warnings.
if(NOT SHOW_MockHTTPinC_WARNINGS)
string(REGEX REPLACE " *-W[a-z][a-z-]+" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
