diff options
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/cmake/core.cmake | 8 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 17 |
4 files changed, 28 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e814755a..7e66aa16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,10 @@ IF(APPLE) set(CMAKE_EXE_LINKER_FLAGS "-lc++ -stdlib=libc++") ENDIF() -add_subdirectory (src) -IF(APPLE) - add_subdirectory (tests) +IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + find_package(PkgConfig) ENDIF() + +add_subdirectory (src) +add_subdirectory (tests) + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cd836809..dd506d27 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -175,6 +175,9 @@ else() message(STATUS "Found zlib") endif() +IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") +pkg_check_modules(GLIB2 glib-2.0) +ENDIF() file(GLOB_RECURSE source_files @@ -202,6 +205,7 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/include" ${additional_includes} /usr/include/tidy /usr/include/libxml2 + ${GLIB2_INCLUDE_DIRS} ) add_library(MailCore diff --git a/src/cmake/core.cmake b/src/cmake/core.cmake index bf710e3d..c4d41e77 100644 --- a/src/cmake/core.cmake +++ b/src/cmake/core.cmake @@ -19,6 +19,13 @@ IF(APPLE) ) ENDIF() +IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + set(basetypes_files_linux + core/basetypes/MCMainThreadGTK.cpp + ) +ENDIF() + + set(basetypes_files core/basetypes/MCArray.cc core/basetypes/MCAssert.c @@ -45,6 +52,7 @@ set(basetypes_files core/basetypes/MCValue.cc core/basetypes/ConvertUTF.c ${basetypes_files_apple} + ${basetypes_files_linux} ) set(imap_files 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}) |