diff options
| -rwxr-xr-x | scripts/travis/before-script.sh | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 30 | ||||
| -rw-r--r-- | src/cmake/public-headers.cmake | 25 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 8 |
4 files changed, 31 insertions, 34 deletions
diff --git a/scripts/travis/before-script.sh b/scripts/travis/before-script.sh index b6ba2464..f345e7cd 100755 --- a/scripts/travis/before-script.sh +++ b/scripts/travis/before-script.sh @@ -13,11 +13,11 @@ elif test x"`uname`" = xLinux ; then cd .. sudo apt-get install libctemplate-dev - sudo apt-get install libicu-dev sudo apt-get install libctemplate-dev sudo apt-get install libsasl2-dev sudo apt-get install libtidy-dev sudo apt-get install uuid-dev sudo apt-get install libxml2-dev + sudo apt-get install libuchardet-dev fi diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ba6ac17b..2e1db1bb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,20 +14,20 @@ include(LibFindMacros) IF(APPLE) set(additional_includes - "${CMAKE_CURRENT_SOURCE_DIR}/../Externals/ctemplate/include" - "${CMAKE_CURRENT_SOURCE_DIR}/../Externals/icu4c/include" - "${CMAKE_CURRENT_SOURCE_DIR}/../Externals/libetpan/include" + "${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 ) set(additional_lib_searchpath - "${CMAKE_CURRENT_SOURCE_DIR}/../Externals/ctemplate/lib" - "${CMAKE_CURRENT_SOURCE_DIR}/../Externals/icu4c/lib" - "${CMAKE_CURRENT_SOURCE_DIR}/../Externals/libetpan/lib" + "${CMAKE_CURRENT_SOURCE_DIR}/../Externals/ctemplate-osx/lib" + "${CMAKE_CURRENT_SOURCE_DIR}/../Externals/uchardet-osx/lib" + "${CMAKE_CURRENT_SOURCE_DIR}/../Externals/libetpan-osx/lib" ) - execute_process(COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/../scripts/prepare.sh" + execute_process(COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/../scripts/get-mac.sh" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../scripts") ELSE() set(additional_includes @@ -52,21 +52,21 @@ else() message(STATUS "Found ctemplate") endif() -# detect icu4c +# detect uchardet -find_path(ICU4C_INCLUDE_DIR - NAMES unicode/utf8.h +find_path(UCHARDET_INCLUDE_DIR + NAMES uchardet/uchardet.h PATHS ${additional_includes} ) -find_library(ICU4C_LIBRARY - NAMES icuuc +find_library(UCHARDET_LIBRARY + NAMES uchardet PATHS ${additional_lib_searchpath} ) -if(NOT ICU4C_INCLUDE_DIR OR NOT ICU4C_LIBRARY) - message(FATAL_ERROR "ERROR: Could not find icu4c") +if(NOT UCHARDET_INCLUDE_DIR OR NOT UCHARDET_LIBRARY) + message(FATAL_ERROR "ERROR: Could not find uchardet") else() - message(STATUS "Found icu4c") + message(STATUS "Found uchardet") endif() # detect libetpan diff --git a/src/cmake/public-headers.cmake b/src/cmake/public-headers.cmake index 65be3be7..b917dec9 100644 --- a/src/cmake/public-headers.cmake +++ b/src/cmake/public-headers.cmake @@ -52,6 +52,10 @@ core/pop/MCPOP.h core/pop/MCPOPMessageInfo.h core/pop/MCPOPProgressCallback.h core/pop/MCPOPSession.h +core/nntp/MCNNTP.h +core/nntp/MCNNTPGroupInfo.h +core/nntp/MCNNTPProgressCallback.h +core/nntp/MCNNTPSession.h core/rfc822/MCRFC822.h core/rfc822/MCAttachment.h core/rfc822/MCMessageBuilder.h @@ -61,10 +65,6 @@ core/rfc822/MCMultipart.h core/smtp/MCSMTP.h core/smtp/MCSMTPProgressCallback.h core/smtp/MCSMTPSession.h -core/nntp/MCNNTP.h -core/nntp/MCNNTPGroupInfo.h -core/nntp/MCNNTPProgressCallback.h -core/nntp/MCNNTPSession.h core/renderer/MCRenderer.h core/renderer/MCHTMLRendererCallback.h core/renderer/MCDateFormatter.h @@ -106,16 +106,14 @@ async/pop/MCPOPFetchMessagesOperation.h async/pop/MCPOPOperationCallback.h async/nntp/MCAsyncNNTP.h async/nntp/MCNNTPAsyncSession.h -async/nntp/MCNNTPCheckAccountOperation.h -async/nntp/MCNNTPDisconnectOperation.h +async/nntp/MCNNTPOperation.h +async/nntp/MCNNTPFetchHeaderOperation.h async/nntp/MCNNTPFetchArticleOperation.h async/nntp/MCNNTPFetchAllArticlesOperation.h -async/nntp/MCNNTPFetchHeaderOperation.h async/nntp/MCNNTPListNewsgroupsOperation.h async/nntp/MCNNTPFetchOverviewOperation.h -async/nntp/MCNNTPOperation.h -async/nntp/MCNNTPOperationCallback.h async/nntp/MCNNTPFetchServerTimeOperation.h +async/nntp/MCNNTPOperationCallback.h objc/MCObjC.h objc/utils/MCOUtils.h objc/utils/MCOObjectWrapper.h @@ -188,16 +186,15 @@ objc/smtp/MCOSMTPSession.h objc/smtp/MCOSMTPSendOperation.h objc/smtp/MCOSMTPOperation.h objc/nntp/MCONNTP.h -objc/nntp/MCONNTPDisconnectOperation.h +objc/nntp/MCONNTPSession.h +objc/nntp/MCONNTPOperation.h +objc/nntp/MCONNTPFetchHeaderOperation.h objc/nntp/MCONNTPFetchArticleOperation.h objc/nntp/MCONNTPFetchAllArticlesOperation.h -objc/nntp/MCONNTPFetchHeaderOperation.h -objc/nntp/MCONNTPGroupInfo.h objc/nntp/MCONNTPListNewsgroupsOperation.h objc/nntp/MCONNTPFetchOverviewOperation.h objc/nntp/MCONNTPFetchServerTimeOperation.h -objc/nntp/MCONNTPOperation.h -objc/nntp/MCONNTPSession.h +objc/nntp/MCONNTPGroupInfo.h objc/provider/MCOProvider.h objc/provider/MCONetService.h objc/provider/MCOMailProvider.h diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 61fa7120..289feb82 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,8 +1,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/../src/include) link_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/ctemplate/lib - ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/icu4c/lib - ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/libetpan/lib + ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/ctemplate-osx/lib + ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/uchardet-osx/lib + ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/libetpan-osx/lib ) find_library(FOUNDATIONFRAMEWORK NAMES Foundation) @@ -10,5 +10,5 @@ find_library(SECURITYFRAMEWORK NAMES Security) find_library(CORESERVICESFRAMEWORK NAMES CoreServices) add_executable (tests main.mm test-all.mm) -target_link_libraries (tests MailCore z etpan xml2 icudata icui18n icuuc sasl2 iconv tidy ctemplate ssl crypto +target_link_libraries (tests MailCore z etpan xml2 uchardet sasl2 iconv tidy ctemplate ssl crypto ${FOUNDATIONFRAMEWORK} ${SECURITYFRAMEWORK} ${CORESERVICESFRAMEWORK}) |