Skip to content

Commit 43b2458

Browse files
committed
CMake:
- 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 43b2458

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

extensions/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,11 @@ 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}
74+
INCLUDES DESTINATION include
7475
)
7576

7677
if (CMARK_SHARED OR CMARK_STATIC)
@@ -79,7 +80,7 @@ if (CMARK_SHARED OR CMARK_STATIC)
7980
DESTINATION include
8081
)
8182

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

8586
# Feature tests
@@ -104,7 +105,7 @@ if(MSVC)
104105
else()
105106
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
106107
endif()
107-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX /wd4706 /wd4204 /wd4221 /wd4100 /D_CRT_SECURE_NO_WARNINGS")
108+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8 /WX /wd4706 /wd4204 /wd4221 /wd4100 /D_CRT_SECURE_NO_WARNINGS")
108109
elseif(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
109110
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -std=c99 -pedantic")
110111
endif()

src/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,11 @@ 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}
162+
INCLUDES DESTINATION include
162163
)
163164

164165
if(CMARK_SHARED OR CMARK_STATIC)
@@ -175,7 +176,7 @@ if(CMARK_SHARED OR CMARK_STATIC)
175176
DESTINATION include
176177
)
177178

178-
install(EXPORT cmark-gfm DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
179+
install(EXPORT cmark-gfm-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
179180
endif()
180181

181182
# Feature tests
@@ -204,7 +205,7 @@ if(MSVC)
204205
else()
205206
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
206207
endif()
207-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX /wd4706 /wd4204 /wd4221 /wd4100 /D_CRT_SECURE_NO_WARNINGS")
208+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8 /WX /wd4706 /wd4204 /wd4221 /wd4100 /D_CRT_SECURE_NO_WARNINGS")
208209
elseif(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
209210
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -std=c99 -pedantic")
210211
endif()

0 commit comments

Comments
 (0)