Use CMake's FindIconv (see #10887)

Author: Croydon

.codedocs

@@ -1,3 +1,3 @@
-EXCLUDE = addon cmake doc examples jquery templates testing winbuild src/logos.cpp src/lodepng.cpp
+EXCLUDE = addon cmake doc examples jquery templates testing deps/iconv_winbuild src/logos.cpp src/lodepng.cpp
 FILE_PATTERNS = *.h *.cpp *.md
 USE_MDFILE_AS_MAINPAGE = src/doxygen.md

CMakeLists.txt

@@ -120,7 +120,13 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSQLITE_OMIT_LOAD_EXTENSION=1")
 if (WIN32)
     if (MSVC)
         if (NOT ICONV_DIR)
-          set(ICONV_DIR "${PROJECT_SOURCE_DIR}/winbuild")
+          if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+            list(APPEND CMAKE_PREFIX_PATH "${PROJECT_SOURCE_DIR}/deps/iconv_winbuild/include" "${PROJECT_SOURCE_DIR}/deps/iconv_winbuild/x64")
+          elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+            list(APPEND CMAKE_PREFIX_PATH "${PROJECT_SOURCE_DIR}/deps/iconv_winbuild/include" "${PROJECT_SOURCE_DIR}/deps/iconv_winbuild/x86")
+          endif()
+        else()
+          list(APPEND CMAKE_PREFIX_PATH ${ICONV_DIR})
         endif()
         set(CMAKE_REQUIRED_DEFINITIONS "-DLIBICONV_STATIC")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") # needed for language.cpp on 64bit
@@ -192,7 +198,7 @@ if ((CMAKE_BUILD_TYPE STREQUAL "Debug") OR enable_lex_debug)
 endif()
 
 find_package(Iconv REQUIRED)
-include_directories(${ICONV_INCLUDE_DIR})
+include_directories(${Iconv_INCLUDE_DIRS})
 
 
 #set(DOXYDOCS ${PROJECT_SOURCE_DIR}/doc CACHE INTERNAL "Path to doxygen docs")

addon/doxyapp/CMakeLists.txt

@@ -4,7 +4,7 @@ include_directories(
 	${PROJECT_SOURCE_DIR}/src
 	${PROJECT_SOURCE_DIR}/libversion
 	${GENERATED_SRC}
-	${ICONV_INCLUDE_DIR}
+	${Iconv_INCLUDE_DIRS}
 	${CLANG_INCLUDEDIR}
 )
 
@@ -46,7 +46,7 @@ mscgen
 doxygen_version
 doxycfg
 vhdlparser
-${ICONV_LIBRARIES}
+${Iconv_LIBRARIES}
 ${CMAKE_THREAD_LIBS_INIT}
 ${SQLITE3_LIBRARIES}
 ${EXTRA_LIBS}

addon/doxyparse/CMakeLists.txt

@@ -4,7 +4,7 @@ include_directories(
 	${PROJECT_SOURCE_DIR}/src
 	${PROJECT_SOURCE_DIR}/libversion
 	${GENERATED_SRC}
-	${ICONV_INCLUDE_DIR}
+	${Iconv_INCLUDE_DIRS}
 	${CLANG_INCLUDEDIR}
 )
 
@@ -35,7 +35,7 @@ mscgen
 doxygen_version
 doxycfg
 vhdlparser
-${ICONV_LIBRARIES}
+${Iconv_LIBRARIES}
 ${CMAKE_THREAD_LIBS_INIT}
 ${SQLITE3_LIBRARIES}
 ${EXTRA_LIBS}

cmake/FindIconv.cmake

@@ -393,7 +393,7 @@ target_link_libraries(doxygen PRIVATE
     xml
     doxygen_version
     vhdlparser
-    ${ICONV_LIBRARIES}
+    ${Iconv_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
     ${EXTRA_LIBS}
     ${CLANG_LIBS}