diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/cmake/async.cmake | 1 | ||||
| -rw-r--r-- | src/cmake/core.cmake | 8 | ||||
| -rw-r--r-- | src/cmake/objc.cmake | 32 | ||||
| -rw-r--r-- | src/cmake/public-headers.cmake | 4 |
5 files changed, 36 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a70ccf5d..bbdf85dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,10 @@ cmake_minimum_required (VERSION 2.6) project (mailcore2) +IF(APPLE) + set(CMAKE_CXX__FLAGS "-std=c++11 -stdlib=libc++") + set(CMAKE_EXE_LINKER_FLAGS "-lc++ -stdlib=libc++") +ENDIF() + add_subdirectory (src) +add_subdirectory (tests) diff --git a/src/cmake/async.cmake b/src/cmake/async.cmake index 8b4857ea..a002d7c5 100644 --- a/src/cmake/async.cmake +++ b/src/cmake/async.cmake @@ -21,6 +21,7 @@ set(async_imap_files async/imap/MCIMAPIdleOperation.cc async/imap/MCIMAPMessageRenderingOperation.cc async/imap/MCIMAPOperation.cc + async/imap/MCIMAPQuotaOperation.cc async/imap/MCIMAPRenameFolderOperation.cc async/imap/MCIMAPSearchOperation.cc async/imap/MCIMAPStoreFlagsOperation.cc diff --git a/src/cmake/core.cmake b/src/cmake/core.cmake index f2678ad1..a7ba18c9 100644 --- a/src/cmake/core.cmake +++ b/src/cmake/core.cmake @@ -21,6 +21,7 @@ set(basetypes_files core/basetypes/MCArray.cc core/basetypes/MCAssert.c core/basetypes/MCAutoreleasePool.cc + core/basetypes/MCBase64.c core/basetypes/MCConnectionLoggerUtils.cc core/basetypes/MCData.cc core/basetypes/MCHash.cc @@ -46,6 +47,7 @@ set(basetypes_files set(imap_files core/imap/MCIMAPFolder.cc core/imap/MCIMAPFolderStatus.cc + core/imap/MCIMAPIdentity.cc core/imap/MCIMAPMessage.cc core/imap/MCIMAPMessagePart.cc core/imap/MCIMAPMultipart.cc @@ -99,6 +101,10 @@ set(zip_files core/zip/MiniZip/zip.c ) +set(security_files + core/security/MCCertificateUtils.cc +) + set(core_files ${basetypes_files} ${abstract_files} @@ -106,6 +112,7 @@ set(core_files ${pop_files} ${renderer_files} ${rfc822_files} + ${security_files} ${smtp_files} ${zip_files} ) @@ -121,6 +128,7 @@ set(core_includes ${CMAKE_CURRENT_SOURCE_DIR}/core/provider ${CMAKE_CURRENT_SOURCE_DIR}/core/renderer ${CMAKE_CURRENT_SOURCE_DIR}/core/rfc822 + ${CMAKE_CURRENT_SOURCE_DIR}/core/security ${CMAKE_CURRENT_SOURCE_DIR}/core/smtp ${CMAKE_CURRENT_SOURCE_DIR}/core/zip ${CMAKE_CURRENT_SOURCE_DIR}/core/zip/MiniZip diff --git a/src/cmake/objc.cmake b/src/cmake/objc.cmake index 57a8c317..e3e461c9 100644 --- a/src/cmake/objc.cmake +++ b/src/cmake/objc.cmake @@ -1,6 +1,6 @@ # Files to build -set(async_objc_abstract +set(objc_abstract_files objc/abstract/MCOAbstractMessage.mm objc/abstract/MCOAbstractMessagePart.mm objc/abstract/MCOAbstractMessageRendererCallback.mm @@ -10,7 +10,7 @@ set(async_objc_abstract objc/abstract/MCOMessageHeader.mm ) -set(async_objc_imap +set(objc_imap_files objc/imap/MCOIMAPAppendMessageOperation.mm objc/imap/MCOIMAPBaseOperation.mm objc/imap/MCOIMAPCapabilityOperation.mm @@ -22,8 +22,9 @@ set(async_objc_imap objc/imap/MCOIMAPFolder.mm objc/imap/MCOIMAPFolderInfo.m objc/imap/MCOIMAPFolderInfoOperation.mm - objc/imap/MCOIMAPFolderStatus.m + objc/imap/MCOIMAPFolderStatus.mm objc/imap/MCOIMAPFolderStatusOperation.mm + objc/imap/MCOIMAPIdentity.mm objc/imap/MCOIMAPIdentityOperation.mm objc/imap/MCOIMAPIdleOperation.mm objc/imap/MCOIMAPMessage.mm @@ -34,12 +35,13 @@ set(async_objc_imap objc/imap/MCOIMAPNamespaceItem.mm objc/imap/MCOIMAPOperation.mm objc/imap/MCOIMAPPart.mm + objc/imap/MCOIMAPQuotaOperation.mm objc/imap/MCOIMAPSearchExpression.mm objc/imap/MCOIMAPSearchOperation.mm objc/imap/MCOIMAPSession.mm ) -set(async_objc_pop +set(objc_pop_files objc/pop/MCOPOPFetchHeaderOperation.mm objc/pop/MCOPOPFetchMessageOperation.mm objc/pop/MCOPOPFetchMessagesOperation.mm @@ -48,13 +50,13 @@ set(async_objc_pop objc/pop/MCOPOPSession.mm ) -set(async_objc_provider +set(objc_provider_files objc/provider/MCOMailProvider.mm objc/provider/MCOMailProvidersManager.mm objc/provider/MCONetService.mm ) -set(async_objc_rfc822 +set(objc_rfc822_files objc/rfc822/MCOAttachment.mm objc/rfc822/MCOMessageBuilder.mm objc/rfc822/MCOMessageParser.mm @@ -62,13 +64,13 @@ set(async_objc_rfc822 objc/rfc822/MCOMultipart.mm ) -set(async_objc_smtp +set(objc_smtp_files objc/smtp/MCOSMTPOperation.mm objc/smtp/MCOSMTPSendOperation.mm objc/smtp/MCOSMTPSession.mm ) -set(async_objc_utils +set(objc_utils_files objc/utils/MCOIndexSet.mm objc/utils/MCOObjectWrapper.mm objc/utils/MCOOperation.mm @@ -83,13 +85,13 @@ set(async_objc_utils ) IF(APPLE) -set(async_objc - ${async_objc_abstract} - ${async_objc_imap} - ${async_objc_pop} - ${async_objc_rfc822} - ${async_objc_smtp} - ${async_objc_utils} +set(objc_files + ${objc_abstract_files} + ${objc_imap_files} + ${objc_pop_files} + ${objc_rfc822_files} + ${objc_smtp_files} + ${objc_utils_files} ) ENDIF() diff --git a/src/cmake/public-headers.cmake b/src/cmake/public-headers.cmake index 41409f59..8395072a 100644 --- a/src/cmake/public-headers.cmake +++ b/src/cmake/public-headers.cmake @@ -47,6 +47,7 @@ core/imap/MCIMAPSearchExpression.h core/imap/MCIMAPSession.h core/imap/MCIMAPSyncResult.h core/imap/MCIMAPFolderStatus.h +core/imap/MCIMAPIdentity.h core/pop/MCPOP.h core/pop/MCPOPMessageInfo.h core/pop/MCPOPProgressCallback.h @@ -88,6 +89,7 @@ async/imap/MCIMAPSearchOperation.h async/imap/MCIMAPFetchNamespaceOperation.h async/imap/MCIMAPIdentityOperation.h async/imap/MCIMAPCapabilityOperation.h +async/imap/MCIMAPQuotaOperation.h async/imap/MCIMAPOperationCallback.h async/imap/MCIMAPMessageRenderingOperation.h async/pop/MCAsyncPOP.h @@ -131,6 +133,7 @@ objc/imap/MCOIMAPMessagePart.h objc/imap/MCOIMAPMultipart.h objc/imap/MCOIMAPNamespace.h objc/imap/MCOIMAPNamespaceItem.h +objc/imap/MCOIMAPIdentity.h objc/imap/MCOIMAPPart.h objc/imap/MCOIMAPFolderInfoOperation.h objc/imap/MCOIMAPFolderInfo.h @@ -145,6 +148,7 @@ objc/imap/MCOIMAPIdleOperation.h objc/imap/MCOIMAPFetchNamespaceOperation.h objc/imap/MCOIMAPIdentityOperation.h objc/imap/MCOIMAPCapabilityOperation.h +objc/imap/MCOIMAPQuotaOperation.h objc/imap/MCOIMAPSearchExpression.h objc/imap/MCOIMAPMessageRenderingOperation.h objc/rfc822/MCORFC822.h |