Merge pull request #13342 from taosdata/fix/ZhiqiangWang/TD-15848-win-iconv-find-error

fix(os): win iconv find error

Merge pull request #13342 from taosdata/fix/ZhiqiangWang/TD-15848-win-iconv-find-error
fix(os): win iconv find error
25b7ee99 · wafwerar · GitHub · 79fef00b · 49b36c78 · 25b7ee99
显示空白变更内容
内联并排

Showing with 5 addition and 1 deletion

source/os/CMakeLists.txt source/os/CMakeLists.txt +5 -1

未找到文件。
--- a/source/os/CMakeLists.txt
+++ b/source/os/CMakeLists.txt
@@ -10,7 +10,11 @@ target_include_directories(
    PUBLIC "${TD_SOURCE_DIR}/contrib/msvcregex"
 )
 # iconv
-find_path(IconvApiIncludes iconv.h PATHS)
+if(TD_WINDOWS)
+    find_path(IconvApiIncludes iconv.h "${TD_SOURCE_DIR}/contrib/iconv")
+else()
+    find_path(IconvApiIncludes iconv.h PATHS)
+endif(TD_WINDOWS)
 if(NOT IconvApiIncludes)
    add_definitions(-DDISALLOW_NCHAR_WITHOUT_ICONV) 
 endif ()