Skip to content

Commit 1660e90

Browse files
committed
- Fix: complie error: C2220 warning C4819 in msvc
- Fix export cmake config bug: See https://cmake.org/cmake/help/v3.26/command/find_package.html?highlight=find_package#search-modes
1 parent 1e23082 commit 1660e90

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

extensions/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
6767

6868
include (InstallRequiredSystemLibraries)
6969
install(TARGETS ${CMARK_INSTALL}
70-
EXPORT cmark-gfm-extensions
70+
EXPORT cmark-gfm-extensions-config
7171
RUNTIME DESTINATION bin
7272
LIBRARY DESTINATION lib${LIB_SUFFIX}
7373
ARCHIVE DESTINATION lib${LIB_SUFFIX}
@@ -79,7 +79,7 @@ if (CMARK_SHARED OR CMARK_STATIC)
7979
DESTINATION include
8080
)
8181

82-
install(EXPORT cmark-gfm-extensions DESTINATION lib${LIB_SUFFIX}/cmake-gfm-extensions)
82+
install(EXPORT cmark-gfm-extensions-config DESTINATION lib${LIB_SUFFIX}/cmake-gfm-extensions)
8383
endif()
8484

8585
# Feature tests
@@ -104,7 +104,7 @@ if(MSVC)
104104
else()
105105
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
106106
endif()
107-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX /wd4706 /wd4204 /wd4221 /wd4100 /D_CRT_SECURE_NO_WARNINGS")
107+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8 /WX /wd4706 /wd4204 /wd4221 /wd4100 /D_CRT_SECURE_NO_WARNINGS")
108108
elseif(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
109109
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -std=c99 -pedantic")
110110
endif()

src/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ endif()
155155
set(libdir lib${LIB_SUFFIX})
156156

157157
install(TARGETS ${PROGRAM} ${CMARK_INSTALL}
158-
EXPORT cmark-gfm
158+
EXPORT cmark-gfm-config
159159
RUNTIME DESTINATION bin
160160
LIBRARY DESTINATION ${libdir}
161161
ARCHIVE DESTINATION ${libdir}
@@ -175,7 +175,7 @@ if(CMARK_SHARED OR CMARK_STATIC)
175175
DESTINATION include
176176
)
177177

178-
install(EXPORT cmark-gfm DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
178+
install(EXPORT cmark-gfm-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
179179
endif()
180180

181181
# Feature tests
@@ -204,7 +204,7 @@ if(MSVC)
204204
else()
205205
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
206206
endif()
207-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX /wd4706 /wd4204 /wd4221 /wd4100 /D_CRT_SECURE_NO_WARNINGS")
207+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8 /WX /wd4706 /wd4204 /wd4221 /wd4100 /D_CRT_SECURE_NO_WARNINGS")
208208
elseif(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
209209
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -std=c99 -pedantic")
210210
endif()

0 commit comments

Comments
 (0)