Skip to content

Commit c0cf35c

Browse files
committed
Revert "remove empty config.h and cmark-gfm_config.h headers"
This reverts commit 6f64876.
1 parent f91a3a0 commit c0cf35c

23 files changed

+59
-1
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ endif()
7676
add_compile_definitions($<$<CONFIG:Debug>:CMARK_DEBUG_NODES>)
7777
# FIXME(compnerd) why do we not use `!defined(NDEBUG)`?
7878
add_compile_definitions($<$<CONFIG:Debug>:DEBUG>)
79+
# Use CMake's generated headers instead of the Swift package prebuilt ones
80+
add_compile_definitions(CMARK_USE_CMAKE_HEADERS)
7981

8082
add_compile_options($<$<AND:$<CONFIG:PROFILE>,$<COMPILE_LANGUAGE:C>>:-pg>)
8183

Package.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ let package = Package(
3838
exclude: [
3939
"scanners.re",
4040
"libcmark-gfm.pc.in",
41+
"config.h.in",
4142
"CMakeLists.txt",
4243
],
4344
cSettings: cSettings

bin/main.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <stdlib.h>
55
#include <string.h>
66

7+
#include "cmark-gfm_config.h"
78
#include "cmark-gfm.h"
89
#include "node.h"
910
#include "cmark-gfm-extension_api.h"

src/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
2+
${CMAKE_CURRENT_BINARY_DIR}/config.h)
3+
14
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libcmark-gfm.pc.in
25
${CMAKE_CURRENT_BINARY_DIR}/libcmark-gfm.pc @ONLY)
36

@@ -68,6 +71,7 @@ install(FILES
6871
include/chunk.h
6972
include/cmark_ctype.h
7073
include/cmark-gfm.h
74+
include/cmark-gfm_config.h
7175
include/cmark-gfm-extension_api.h
7276
include/cmark-gfm_version.h
7377
include/export.h

src/blocks.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
#include "cmark_ctype.h"
1515
#include "syntax_extension.h"
16+
#include "cmark-gfm_config.h"
1617
#include "parser.h"
1718
#include "cmark-gfm.h"
1819
#include "node.h"

src/buffer.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <stdlib.h>
88
#include <string.h>
99

10+
#include "cmark-gfm_config.h"
1011
#include "cmark_ctype.h"
1112
#include "buffer.h"
1213

src/commonmark.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <stdlib.h>
66
#include <string.h>
77

8+
#include "cmark-gfm_config.h"
89
#include "cmark-gfm.h"
910
#include "node.h"
1011
#include "buffer.h"

src/config.h.in

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#ifndef CMARK_CONFIG_H
2+
#define CMARK_CONFIG_H
3+
4+
#ifdef __cplusplus
5+
extern "C" {
6+
#endif
7+
8+
#ifdef __cplusplus
9+
}
10+
#endif
11+
12+
#endif

src/html.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <string.h>
66

77
#include "cmark_ctype.h"
8+
#include "cmark-gfm_config.h"
89
#include "cmark-gfm.h"
910
#include "houdini.h"
1011
#include "scanners.h"

src/include/buffer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <string.h>
77
#include <limits.h>
88
#include <stdint.h>
9+
#include "cmark-gfm_config.h"
910
#include "cmark-gfm.h"
1011

1112
#ifdef __cplusplus

0 commit comments

Comments
 (0)