diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/cmake/core.cmake | 3 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | tests/main.cpp | 43 |
5 files changed, 61 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e814755a..542d778b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required (VERSION 2.6) +find_package(PkgConfig) project (mailcore2) IF(APPLE) @@ -7,6 +8,4 @@ IF(APPLE) ENDIF() add_subdirectory (src) -IF(APPLE) add_subdirectory (tests) -ENDIF() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cd836809..d4b12d2b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -175,6 +175,7 @@ else() message(STATUS "Found zlib") endif() +pkg_check_modules (GLIB2 glib-2.0) file(GLOB_RECURSE source_files @@ -202,6 +203,7 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/include" ${additional_includes} /usr/include/tidy /usr/include/libxml2 + ${GLIB2_INCLUDE_DIRS} ) add_library(MailCore @@ -209,3 +211,5 @@ add_library(MailCore ${async_files} ${objc_files} ) + + diff --git a/src/cmake/core.cmake b/src/cmake/core.cmake index bf710e3d..4e69f881 100644 --- a/src/cmake/core.cmake +++ b/src/cmake/core.cmake @@ -18,6 +18,9 @@ IF(APPLE) core/rfc822/MCMessageParserMac.mm ) ENDIF() + set(basetypes_files_apple + core/basetypes/MCMainThreadGTK.cpp + ) set(basetypes_files core/basetypes/MCArray.cc diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 289feb82..58bdcf70 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,14 +1,17 @@ -include_directories(${CMAKE_CURRENT_BINARY_DIR}/../src/include) +pkg_check_modules (GLIB2 glib-2.0) + +include_directories(${CMAKE_CURRENT_BINARY_DIR}/../src/include ${GLIB2_INCLUDE_DIRS}) link_directories( ${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) -find_library(SECURITYFRAMEWORK NAMES Security) -find_library(CORESERVICESFRAMEWORK NAMES CoreServices) +#find_library(FOUNDATIONFRAMEWORK NAMES Foundation) +#find_library(SECURITYFRAMEWORK NAMES Security) +#find_library(CORESERVICESFRAMEWORK NAMES CoreServices) + +add_executable (tests main.cpp) +target_link_libraries (tests MailCore z etpan xml2 uchardet sasl2 tidy ctemplate ssl crypto pthread icudata icui18n icuio icule iculx icutest icutu icuuc uuid ${GLIB2_LIBRARIES}) + -add_executable (tests main.mm test-all.mm) -target_link_libraries (tests MailCore z etpan xml2 uchardet sasl2 iconv tidy ctemplate ssl crypto - ${FOUNDATIONFRAMEWORK} ${SECURITYFRAMEWORK} ${CORESERVICESFRAMEWORK}) diff --git a/tests/main.cpp b/tests/main.cpp new file mode 100644 index 00000000..1b1a5773 --- /dev/null +++ b/tests/main.cpp @@ -0,0 +1,43 @@ +// +// main.m +// tests +// +// Created by DINH Viêt Hoà on 1/10/13. +// Copyright (c) 2013 MailCore. All rights reserved. +// + +#include <MailCore/MailCore.h> +#include <glib.h> + +using namespace mailcore; + +class MyCallback : public OperationCallback { + virtual void operationFinished(Operation * op) { + fprintf(stderr, "operation finished\n"); + IMAPFetchFoldersOperation * folderOp = (IMAPFetchFoldersOperation *) op; + fprintf(stderr, "result %s", MCUTF8(folderOp->folders())); + } +}; + +int main(int argc, const char * argv[]) +{ + + GMainLoop * main_loop = g_main_loop_new (NULL, FALSE); + + IMAPAsyncSession * session = new IMAPAsyncSession(); + session->setHostname(MCSTR("imap.gmail.com")); + session->setPort(993); + session->setUsername(MCSTR("johndoe@gmail.com")); + session->setPassword(MCSTR("blah")); + session->setConnectionType(ConnectionTypeTLS); + MyCallback * callback = new MyCallback(); + IMAPFetchFoldersOperation * op = session->fetchAllFoldersOperation(); + op->setCallback(callback); + op->start(); + fprintf(stderr, "started op\n"); + + g_main_loop_run(main_loop); + + return 0; +} + |