Skip to content

Commit 2eac3ff

Browse files
use CMAKE_C_STANDARD to set C standard
1 parent 72b412b commit 2eac3ff

File tree

4 files changed

+8
-15
lines changed

4 files changed

+8
-15
lines changed

CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ option(CMARK_SHARED "Build shared libcmark-gfm library" ON)
2020
option(CMARK_LIB_FUZZER "Build libFuzzer fuzzing harness" OFF)
2121
option(CMARK_THREADING "Add locks around static accesses" OFF)
2222

23+
# set a required C standard so we can load stdbool.h
24+
if(MSVC)
25+
set(CMAKE_C_STANDARD 11)
26+
else()
27+
set(CMAKE_C_STANDARD 99)
28+
endif()
29+
set(CMAKE_C_STANDARD_REQUIRED YES)
30+
2331
add_subdirectory(src)
2432
add_subdirectory(extensions)
2533
if(CMARK_TESTS AND (CMARK_SHARED OR CMARK_STATIC))

api_test/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,4 @@ elseif(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
3030
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -std=c99 -pedantic")
3131
endif()
3232

33-
# On MSVC 15.0 and newer, compile with C11 standard
34-
if (MSVC AND MSVC_VERSION GREATER_EQUAL 1910)
35-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /std:c11")
36-
endif()
37-
3833
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DCMARK_USE_CMAKE_HEADERS")

extensions/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,6 @@ if(MSVC AND MSVC_VERSION LESS 1800)
124124
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /TP")
125125
endif()
126126

127-
# On MSVC 15.0 and newer, compile with C11 standard
128-
if (MSVC AND MSVC_VERSION GREATER_EQUAL 1910)
129-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /std:c11")
130-
endif()
131-
132127
if(CMAKE_BUILD_TYPE STREQUAL "Ubsan")
133128
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined")
134129
endif()

src/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,6 @@ if(MSVC AND MSVC_VERSION LESS 1800)
208208
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /TP")
209209
endif()
210210

211-
# On MSVC 15.0 and newer, compile with C11 standard
212-
if (MSVC AND MSVC_VERSION GREATER_EQUAL 1910)
213-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /std:c11")
214-
endif()
215-
216211
if(CMAKE_BUILD_TYPE STREQUAL "Ubsan")
217212
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined")
218213
endif()

0 commit comments

Comments
 (0)