diff options
| -rw-r--r-- | CMakeLists.txt | 20 | ||||
| -rwxr-xr-x | scripts/get-ios.sh | 2 | ||||
| -rwxr-xr-x | scripts/get-mac.sh | 2 | ||||
| -rw-r--r-- | src/cmake/core.cmake | 28 |
4 files changed, 30 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 27ae32d9..3a926538 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,13 +7,11 @@ IF(APPLE) set(additional_lib_searchpath "${CMAKE_CURRENT_SOURCE_DIR}/Externals/ctemplate-osx/lib" - "${CMAKE_CURRENT_SOURCE_DIR}/Externals/uchardet-osx/lib" "${CMAKE_CURRENT_SOURCE_DIR}/Externals/libetpan-osx/lib" ) set(additional_includes "${CMAKE_CURRENT_SOURCE_DIR}/Externals/ctemplate-osx/include" - "${CMAKE_CURRENT_SOURCE_DIR}/Externals/uchardet-osx/include" "${CMAKE_CURRENT_SOURCE_DIR}/Externals/libetpan-osx/include" /usr/include/tidy /usr/include/libxml2 @@ -85,24 +83,6 @@ else() endif() -# detect uchardet - -find_path(UCHARDET_INCLUDE_DIR - NAMES uchardet/uchardet.h - PATHS ${additional_includes} -) -find_library(UCHARDET_LIBRARY - NAMES uchardet - PATHS ${additional_lib_searchpath} -) - -if(NOT UCHARDET_INCLUDE_DIR OR NOT UCHARDET_LIBRARY) - message(FATAL_ERROR "ERROR: Could not find uchardet") -else() - message(STATUS "Found uchardet") -endif() - - # detect libetpan find_path(LIBETPAN_INCLUDE_DIR diff --git a/scripts/get-ios.sh b/scripts/get-ios.sh index 006fa0bf..69ba6307 100755 --- a/scripts/get-ios.sh +++ b/scripts/get-ios.sh @@ -6,7 +6,7 @@ popd > /dev/null . "$scriptpath/include.sh/build-dep.sh" -deps="ctemplate-ios libetpan-ios tidy-html5-ios uchardet-ios" +deps="ctemplate-ios libetpan-ios tidy-html5-ios" for dep in $deps ; do name="$dep" get_prebuilt_dep diff --git a/scripts/get-mac.sh b/scripts/get-mac.sh index 12edbcee..7f015eda 100755 --- a/scripts/get-mac.sh +++ b/scripts/get-mac.sh @@ -6,7 +6,7 @@ popd > /dev/null . "$scriptpath/include.sh/build-dep.sh" -deps="ctemplate-osx libetpan-osx uchardet-osx" +deps="ctemplate-osx libetpan-osx" for dep in $deps ; do name="$dep" get_prebuilt_dep diff --git a/src/cmake/core.cmake b/src/cmake/core.cmake index 51ce8929..dd8d264c 100644 --- a/src/cmake/core.cmake +++ b/src/cmake/core.cmake @@ -56,6 +56,31 @@ set(basetypes_files ${basetypes_files_linux} ) +set(icu_ucsdet_files + core/basetypes/icu-ucsdet/cmemory.c + core/basetypes/icu-ucsdet/csdetect.cpp + core/basetypes/icu-ucsdet/csmatch.cpp + core/basetypes/icu-ucsdet/csr2022.cpp + core/basetypes/icu-ucsdet/csrecog.cpp + core/basetypes/icu-ucsdet/csrmbcs.cpp + core/basetypes/icu-ucsdet/csrsbcs.cpp + core/basetypes/icu-ucsdet/csrucode.cpp + core/basetypes/icu-ucsdet/csrutf8.cpp + core/basetypes/icu-ucsdet/cstring.c + core/basetypes/icu-ucsdet/inputext.cpp + core/basetypes/icu-ucsdet/uarrsort.c + core/basetypes/icu-ucsdet/ucln_cmn.cpp + core/basetypes/icu-ucsdet/ucln_in.cpp + core/basetypes/icu-ucsdet/ucsdet.cpp + core/basetypes/icu-ucsdet/udataswp.c + core/basetypes/icu-ucsdet/uenum.c + core/basetypes/icu-ucsdet/uinvchar.c + core/basetypes/icu-ucsdet/umutex.cpp + core/basetypes/icu-ucsdet/uobject.cpp + core/basetypes/icu-ucsdet/ustring.cpp + core/basetypes/icu-ucsdet/utrace.c +) + set(imap_files core/imap/MCIMAPFolder.cpp core/imap/MCIMAPFolderStatus.cpp @@ -123,6 +148,7 @@ set(security_files set(core_files ${basetypes_files} + ${icu_ucsdet_files} ${abstract_files} ${imap_files} ${pop_files} @@ -140,6 +166,8 @@ set(core_includes "${CMAKE_CURRENT_SOURCE_DIR}/core" "${CMAKE_CURRENT_SOURCE_DIR}/core/abstract" "${CMAKE_CURRENT_SOURCE_DIR}/core/basetypes" + "${CMAKE_CURRENT_SOURCE_DIR}/core/basetypes/icu-ucsdet" + "${CMAKE_CURRENT_SOURCE_DIR}/core/basetypes/icu-ucsdet/include" "${CMAKE_CURRENT_SOURCE_DIR}/core/imap" "${CMAKE_CURRENT_SOURCE_DIR}/core/pop" "${CMAKE_CURRENT_SOURCE_DIR}/core/nntp" |