From 43b24586ea3883517cc4fe8f9ed51bb64a744d8d Mon Sep 17 00:00:00 2001
From: Kang Lin <kl222@126.com>
Date: Fri, 14 Apr 2023 20:04:58 +0800
Subject: [PATCH] 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
---
 extensions/CMakeLists.txt | 7 ++++---
 src/CMakeLists.txt        | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt
index e545b6d6f..e37f7dfd0 100644
--- a/extensions/CMakeLists.txt
+++ b/extensions/CMakeLists.txt
@@ -67,10 +67,11 @@ set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
 
 include (InstallRequiredSystemLibraries)
 install(TARGETS ${CMARK_INSTALL}
-  EXPORT cmark-gfm-extensions
+  EXPORT cmark-gfm-extensions-config
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib${LIB_SUFFIX}
   ARCHIVE DESTINATION lib${LIB_SUFFIX}
+  INCLUDES DESTINATION include
   )
 
 if (CMARK_SHARED OR CMARK_STATIC)
@@ -79,7 +80,7 @@ if (CMARK_SHARED OR CMARK_STATIC)
   DESTINATION include
   )
 
-  install(EXPORT cmark-gfm-extensions DESTINATION lib${LIB_SUFFIX}/cmake-gfm-extensions)
+  install(EXPORT cmark-gfm-extensions-config DESTINATION lib${LIB_SUFFIX}/cmake-gfm-extensions)
 endif()
 
 # Feature tests
@@ -104,7 +105,7 @@ if(MSVC)
   else()
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
   endif()
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX /wd4706 /wd4204 /wd4221 /wd4100 /D_CRT_SECURE_NO_WARNINGS")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8 /WX /wd4706 /wd4204 /wd4221 /wd4100 /D_CRT_SECURE_NO_WARNINGS")
 elseif(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -std=c99 -pedantic")
 endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 84dd2a037..f4866c2cc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -155,10 +155,11 @@ endif()
 set(libdir lib${LIB_SUFFIX})
 
 install(TARGETS ${PROGRAM} ${CMARK_INSTALL}
-  EXPORT cmark-gfm
+  EXPORT cmark-gfm-config
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION ${libdir}
   ARCHIVE DESTINATION ${libdir}
+  INCLUDES DESTINATION include
   )
 
 if(CMARK_SHARED OR CMARK_STATIC)
@@ -175,7 +176,7 @@ if(CMARK_SHARED OR CMARK_STATIC)
     DESTINATION include
     )
 
-  install(EXPORT cmark-gfm DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+  install(EXPORT cmark-gfm-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
 endif()
 
 # Feature tests
@@ -204,7 +205,7 @@ if(MSVC)
   else()
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
   endif()
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX /wd4706 /wd4204 /wd4221 /wd4100 /D_CRT_SECURE_NO_WARNINGS")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8 /WX /wd4706 /wd4204 /wd4221 /wd4100 /D_CRT_SECURE_NO_WARNINGS")
 elseif(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -std=c99 -pedantic")
 endif()